direnv and cached nix shells

2 files changed, 5 insertions, 1 deletions

diff --git a/modules/nix/system/default.nix b/modules/nix/system/default.nix
index 990e562..9c5c51e 100644
--- a/modules/nix/system/default.nix
+++ b/modules/nix/system/default.nix
@@ -1,4 +1,4 @@
-{
+{config, pkgs, ...}: {
   nix = {
     gc.automatic = false; # use nh cleaner instead
 
@@ -25,4 +25,6 @@
     flake = "/home/collin/nixos";
     clean.enable = true;
   };
+
+  hjem.users."${config.collinux.user.name}".packages = [pkgs.cached-nix-shell];
 }
diff --git a/modules/terminal/system/programs/fish.nix b/modules/terminal/system/programs/fish.nix
index 418aac3..fe3ff88 100644
--- a/modules/terminal/system/programs/fish.nix
+++ b/modules/terminal/system/programs/fish.nix
@@ -13,6 +13,7 @@
         echo fish (prompt_pwd)
     end
 
+    direnv hook fish | source
     pay-respects fish --alias | source
   '';
 in
@@ -31,6 +32,7 @@ in
         unzip
         btop
         jq
+        direnv
         pay-respects
       ];
     };