Add direnv integration to vscode

Reviewed-on: #30

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

@@ -15,6 +15,7 @@
     ./programs/direnv.nix
     ./programs/firefox.nix
     ./programs/tmux.nix
+    ./programs/vscode.nix
     ./wm/rofi.nix
     ./wm/cursor.nix
     ./wm/dconf.nix

programs/direnv.nix

@@ -6,8 +6,8 @@
     enableZshIntegration = true;
     nix-direnv.enable = true;
   };
-
+  
-  home.sessionVariables = {
+  home.file.".config/direnv/direnvrc" = {
-    DIRENV_CACHE = "${config.home.homeDirectory}/.cache/direnv";
+    source = ./direnv/direnvrc;
   };
 }

programs/direnv/direnvrc

@@ -0,0 +1,15 @@
+# Place in ~/.config/direnv/direnvrc
+
+# Two things to know:
+# * `direnv_layour_dir` is called once for every {.direnvrc,.envrc} sourced
+# * The indicator for a different direnv file being sourced is a different $PWD value
+# This means we can hash $PWD to get a fully unique cache path for any given environment
+
+: ${XDG_CACHE_HOME:=$HOME/.cache}
+declare -A direnv_layout_dirs
+direnv_layout_dir() {
+	echo "${direnv_layout_dirs[$PWD]:=$(
+		echo -n "$XDG_CACHE_HOME"/direnv/layouts/
+		echo -n "$PWD" | sha1sum | cut -d ' ' -f 1
+	)}"
+}

programs/firefox.nix

@@ -4,6 +4,12 @@
   programs.firefox = {
     enable = true;
 
+    profiles.default = {
+      settings = {
+        "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
+      };
+    };
+
     policies = {
       # From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
       ExtensionSettings = with builtins;

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

@@ -30,8 +30,8 @@
       };
 
       decoration = {
-        inactive_opacity = 0.8;
+        inactive_opacity = 0.9;
-        active_opacity = 0.9;
+        active_opacity = 1.0;
         rounding = 5;
         rounding_power = 2.5;
         blur = {
@@ -122,6 +122,8 @@
 	", XF86AudioMute,        exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
 	", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
 	", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        ", XF86AudioNext,        exec, playerctl next"
+        ", XF86AudioPrev,        exec, playerctl previous"
       ];
 
       bindm = [

wm/hyprpaper.nix

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

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" = ["" "" "" "" ""];
+      };
     };
   };
 }