summary refs log tree commit diff stats
path: root/user/settings
diff options
context:
space:
mode:
authorAlan Pearce2024-04-29 08:07:44 +0200
committerAlan Pearce2024-04-29 08:07:44 +0200
commit4d56526b0a391443b471fa5db6b154fcecbb15ff (patch)
tree54fcdc40076d8bf3b040b596273439b9127f43bd /user/settings
parente0ee29efdea8c63d65cd81ba9a767320e95ee8c1 (diff)
downloadnixfiles-4d56526b0a391443b471fa5db6b154fcecbb15ff.tar.lz
nixfiles-4d56526b0a391443b471fa5db6b154fcecbb15ff.tar.zst
nixfiles-4d56526b0a391443b471fa5db6b154fcecbb15ff.zip
fish: switch from nix-your-shell to any-nix-shell
Diffstat (limited to 'user/settings')
-rw-r--r--user/settings/fish.nix2
-rw-r--r--user/settings/nix.nix5
2 files changed, 2 insertions, 5 deletions
diff --git a/user/settings/fish.nix b/user/settings/fish.nix
index de4ec062..7e144e05 100644
--- a/user/settings/fish.nix
+++ b/user/settings/fish.nix
@@ -23,7 +23,9 @@
           };
         }
       ];
+    # TODO: pre-generate nix-your-shell
     interactiveShellInit = ''
+      ${pkgs.nix-your-shell}/bin/nix-your-shell fish | source
       bind \es __ghq_repository_search
       # don't bind ctrl-t, it does nice things on macOS/BSD
       set FZF_CTRL_T_COMMAND
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index 30bfe47a..c24bb984 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -10,13 +10,8 @@ in
     ../../pin.nix
   ];
   nixpkgs.config = import ../config.nix;
-  # move to system config
-  programs.fish.interactiveShellInit = ''
-    any-nix-shell fish --info-right | source
-  '';
 
   home.packages = with pkgs; [
-    any-nix-shell
     nil
     nix-prefetch-scripts
     nix-init