Merge remote-tracking branch 'gum/master'

1 files changed, 29 insertions, 4 deletions

diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 8d6c1f2f0..cf6f1d334 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -8,11 +8,10 @@
     };
   };
   imports = [
-    { #direnv
+    { 
       home-manager.users.makefu.home.packages = [
         (pkgs.writers.writeDashBin "privatefox" "exec firefox -P Privatefox")
-        pkgs.direnv pkgs.nur.repos.kalbasit.nixify ];
-        # home-manager.users.makefu.home.file.".direnvrc".text = '''';
+      ];
     }
     { # bat
       home-manager.users.makefu.home.packages = [ pkgs.bat ];
@@ -24,8 +23,34 @@
       };
     }
   ];
-  environment.pathsToLink = [ "/share/zsh" ];
+  environment.pathsToLink = [
+    "/share/zsh"
+  ];
+
+  nix.extraOptions = ''
+    keep-outputs = true
+    keep-derivations = true
+  '';
+
   home-manager.users.makefu = {
+
+    programs.direnv.enable = true;
+    programs.direnv.enableNixDirenvIntegration = true;
+    programs.direnv.enableZshIntegration = true;
+    home.packages = [ (pkgs.writeDashBin "nixify" ''
+test ! -e shell.nix && cat > shell.nix <<EOF
+{ pkgs ? import <nixpkgs> {}}:
+
+pkgs.mkShell {
+  nativeBuildInputs = [ pkgs.hello ];
+}
+EOF
+echo "use nix" >> .envrc
+direnv allow
+'')
+    ];
+    #home.packages = [ pkgs.direnv pkgs.nix-direnv ];
+
     programs.fzf.enable = false; # alt-c
     programs.zsh = {
       enable = true;