From 4d56526b0a391443b471fa5db6b154fcecbb15ff Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 29 Apr 2024 08:07:44 +0200
Subject: fish: switch from nix-your-shell to any-nix-shell

---
 user/settings/fish.nix | 2 ++
 user/settings/nix.nix  | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'user/settings')

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
-- 
cgit 1.4.1