Merge pull request 'master > work' (#36) from master into work

Reviewed-on: #36

flake.nix

@@ -19,7 +19,10 @@
     }:
     let
       system = "x86_64-linux";
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
     in
     {
       homeConfigurations = {

home.nix

@@ -17,6 +17,7 @@
     ./programs/tmux.nix
     ./programs/git.nix
     ./programs/libreoffice.nix
+    ./programs/vscode.nix
     ./wm/rofi.nix
     ./wm/cursor.nix
     ./wm/dconf.nix

programs/git.nix

@@ -5,7 +5,7 @@
     enable = true;
     settings.user = {
       name = "Armel van Ravels";
-      email = "armel@localhost";
+      email = "armel@webavance.nl";
     };
   };
 }

programs/vscode.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  programs.vscode = {
+    enable = true;
+
+    package = pkgs.vscode.fhs;
+    profiles.default.extensions = with pkgs.vscode-extensions; [
+      ms-dotnettools.csharp
+      ms-dotnettools.csdevkit
+      ms-dotnettools.vscode-dotnet-runtime
+      mkhl.direnv   # Direnv integration for VSCode
+    ];
+
+    profiles.default.userSettings = {
+      "direnv.restart.automatic" = true;
+      "terminal.integrated.defaultProfile.linux" = "zsh";
+      "terminal.integrated.profiles.linux" = {
+        zsh = {
+          path = pkgs.zsh;
+        };
+      };
+    };
+  };
+}

wm/hyprland.nix

@@ -23,6 +23,7 @@
       "$terminal" = "kitty";
       "$menu" = "rofi -show drun";
       "$bluetoothMenu" = "bzmenu --launcher rofi";
+      "$files" = "rofi -show filebrowser";
 
       ### BASIC LAYOUT
       general = {
@@ -31,8 +32,8 @@
       };
 
       decoration = {
-        inactive_opacity = 0.8;
-        active_opacity = 0.9;
+        inactive_opacity = 0.9;
+        active_opacity = 1.0;
         rounding = 5;
         rounding_power = 2.5;
         blur = {
@@ -77,6 +78,7 @@
         "$mod, RETURN, exec, $terminal"
         "$mod, D, exec, $menu"
         "$mod, B, exec, $bluetoothMenu"
+        "$mod, G, exec, $files"
         "$mod, Q, killactive"
         "$mod, F, fullscreen"
         "$mod, M, exit"

wm/hyprpaper.nix

@@ -15,6 +15,7 @@ in
       ];
       wallpaper = [
         "DP-2,${wallpaper2}"
+        "HDMI-A-1,${wallpaper2}"
         ",${wallpaper}"
       ];
     };

wm/rofi.nix

@@ -1,6 +1,10 @@
 { pkgs, ... }:
 
 {
+  home.packages = [
+    pkgs.rofi-file-browser
+  ];
+
   programs.rofi = {
     enable = true;
     theme = "material";

wm/waybar.nix

@@ -24,6 +24,7 @@
         "pulseaudio"
         "cpu"
         "tray"
+        "battery"
         "clock"
       ];
 
@@ -49,6 +50,10 @@
         ignored-players = [ "firefox" "vlc" ];
       };
 
+      tray = {
+        spacing = 10;
+      };
+
       cpu = {
         format = "  {usage}%";
         tooltip = false;
@@ -62,6 +67,11 @@
         format = "{icon} {name}";
         on-click = "activate";
       };
+
+      battery = {
+        "format" = "{icon}  {capacity}%";
+        "format-icons" = ["" "" "" "" ""];
+      };
     };
   };
 }