all repos — nixfiles @ 05e6b8b17e8cafc44da14c62e92ac93470c8963d

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

fish: split dev tools to dev/fish

Alan Pearce
commit

05e6b8b17e8cafc44da14c62e92ac93470c8963d

parent

4f4c21036042e6be30e47fd01029bfbfbabe28ac

4 files changed, 25 insertions(+), 17 deletions(-)

changed files
M user/hosts/marvin.nix → user/hosts/marvin.nix
@@ -10,6 +10,7 @@ {
   imports = [
     ../settings/base.nix
     ../settings/development/base.nix
+    ../settings/development/fish.nix
     ../settings/development/javascript.nix
     ../settings/development/python.nix
     ../settings/development/golang.nix
M user/hosts/prefect.nix → user/hosts/prefect.nix
@@ -8,6 +8,7 @@ ../settings/base.nix
     ../settings/dunst.nix
     ../settings/emacs.nix
     ../settings/development/base.nix
+    ../settings/development/fish.nix
     ../settings/development/golang.nix
     ../settings/development/javascript.nix
     ../settings/development/web.nix
A user/settings/development/fish.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = [ pkgs.fish-lsp ];
+  programs.emacs.extraPackages = epkgs: [
+    epkgs.fish-mode
+  ];
+  programs.zed-editor.userSettings = {
+    languages.Fish = {
+      tab_size = 4;
+      language_servers = [ "fish-lsp" ];
+    };
+    lsp.fish-lsp = {
+      binary = {
+        path = "fish-lsp";
+        arguments = [ "start" ];
+      };
+    };
+  };
+
+}
M user/settings/fish.nix → user/settings/fish.nix
@@ -13,7 +13,6 @@ direct_symlink = path: config.lib.file.mkOutOfStoreSymlink "${nixfiles}/${removePrefix "/" path}";
 in
 {
   home.shell.enableFishIntegration = true;
-  home.packages = [ pkgs.fish-lsp ];
   programs.fish = {
     enable = true;
     plugins =

@@ -71,22 +70,6 @@ source = direct_symlink "/user/settings/fish/per-term";
   };
   xdg.configFile."fish/conf.d/user_config.fish" = {
     source = direct_symlink "/user/settings/fish/config.fish";
-  };
-
-  programs.emacs.extraPackages = epkgs: [
-    epkgs.fish-mode
-  ];
-  programs.zed-editor.userSettings = {
-    languages.Fish = {
-      tab_size = 4;
-      language_servers = [ "fish-lsp" ];
-    };
-    lsp.fish-lsp = {
-      binary = {
-        path = "fish-lsp";
-        arguments = [ "start" ];
-      };
-    };
   };
 
   programs.nix-your-shell = {