all repos — nixfiles @ afd408369e242b66a4c8408a48286abe50500331

System and user configuration, managed by nix and home-manager

fish: avoid home-manager conflicts on first run

Alin
commit

afd408369e242b66a4c8408a48286abe50500331

parent

ac5940f6364a92606b2ea13647fa6ddaee1f72a5

1 file changed, 7 insertions(+), 2 deletions(-)

changed files
M user/settings/fish.nix → user/settings/fish.nix
@@ -43,11 +43,11 @@ fadd = "funced --save";
       fed = "funced --save";
     };
   };
-  xdg.configFile."fish/completions" = {
+  xdg.configFile."fish/home-manager/completions" = {
     recursive = true;
     source = direct_symlink "/user/settings/fish/completions";
   };
-  xdg.configFile."fish/functions" = {
+  xdg.configFile."fish/home-manager/functions" = {
     recursive = true;
     source = direct_symlink "/user/settings/fish/functions";
   };

@@ -65,6 +65,11 @@ enable = true;
     nix-output-monitor.enable = true;
     enableFishIntegration = true;
   };
+
+  programs.fish.shellInit = ''
+    set fish_function_path $fish_function_path[1] ${config.xdg.configHome}/fish/home-manager/functions $fish_function_path[2..-1]
+    set --prepend fish_complete_path ${config.xdg.configHome}/fish/home-manager/complete
+  '';
 
   home.activation.sponge-configure = ''
     run ${lib.getExe config.programs.fish.package} -c '