direnv + nix-direnv

Signed-off-by: Colton J. McCurdy <mccurdyc22@gmail.com>
mccurdyc · Sep 18, 2022 · 2504d7f · 2504d7f
1 parent 1ffbd1f
commit 2504d7f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/modules/packages/default.nix b/modules/packages/default.nix
@@ -24,15 +24,10 @@ in {
       gopls
       hadolint
       htop
-      hugo
       jq
-      ngrok
-      niv
       nodePackages.bash-language-server
       nodePackages.dockerfile-language-server-nodejs
       nodePackages.lua-fmt
-      nodePackages.webpack
-      nodePackages.webpack-cli
       nodePackages.yaml-language-server
       nodejs
       pinentry-curses

diff --git a/modules/system/configuration.nix b/modules/system/configuration.nix
@@ -10,8 +10,10 @@
   services.xserver.desktopManager.xterm.enable = false;
   programs.zsh.enable = true;
   environment.systemPackages = with pkgs; [
+    direnv
     git
     mosh
+    nix-direnv
     vim
     wget
     zsh
@@ -29,6 +31,7 @@
     };
     extraOptions = ''
       experimental-features = nix-command flakes
+      # nix options for derivations to persist garbage collection
       keep-outputs = true
       keep-derivations = true
     '';
@@ -67,6 +70,15 @@
     EDITOR = "nvim";
   };
 
+  environment.pathsToLink = [
+    "/share/nix-direnv"
+  ];
+
+  # if you also want support for flakes
+  nixpkgs.overlays = [
+    (self: super: {nix-direnv = super.nix-direnv.override {enableFlakes = true;};})
+  ];
+
   # Lots of stuff that claims doesn't work, actually works.
   nixpkgs.config = {
     allowUnfree = true;

diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix
@@ -33,6 +33,17 @@ in {
         gitfc = ''(){ git log --format=format:"%H" | tail -1 ;}'';
         gp = "git push";
         kubectl_pods_containers = ''kubectl get pods -o jsonpath='{range .items[*]}{"\n"}{.metadata.name}{":\t"}{range .spec.containers[*]}{.name}{", "}{end}{end}' | sort'';
+        # https://github.com/nix-community/nix-direnv/wiki/Shell-integration
+        flakify = ''
+          (){
+            if [ ! -e flake.nix ]; then
+              nix flake new -t github:nix-community/nix-direnv .
+            elif [ ! -e .envrc ]; then
+              echo "use flake" > .envrc
+              direnv allow
+            fi
+          }
+        '';
       };
       history = {
         size = 10000;
@@ -75,6 +86,7 @@ in {
         setopt interactive_comments
         setopt nobeep
 
+        eval "$(direnv hook zsh)"
         eval "$(starship init zsh)"
 
         source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh