all repos — nixfiles @ 5404bbc0efbb5676466739a19cb166c704f4028b

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

fish: refactor plugin loading

Alan Pearce
commit

5404bbc0efbb5676466739a19cb166c704f4028b

parent

d4bf97678862f6129ff286f205d5b05649b81d51

1 file changed, 27 insertions(+), 22 deletions(-)

changed files
M user/settings/fish.nix → user/settings/fish.nix
@@ -3,33 +3,38 @@ pkgs,
   lib,
   ...
 }:
+let
+  inherit (builtins) map;
+  inherit (lib) getAttrs;
+in
 {
   home.shell.enableFishIntegration = true;
   programs.fish = {
     enable = true;
     plugins =
-      let
-        fromNixpkgs = pkg: {
-          name = pkg.name;
-          src = pkg.src;
-        };
-      in
-      with pkgs.fishPlugins;
-      [
-        (fromNixpkgs fzf-fish)
-        (fromNixpkgs autopair)
-        (fromNixpkgs hydro)
-        {
-          name = "ghq";
-          src = pkgs.fetchFromGitHub {
-            owner = "decors";
-            repo = "fish-ghq";
-            sha256 = "0cv7jpvdfdha4hrnjr887jv1pc6vcrxv2ahy7z6x562y7fd77gg9";
-            # date = "2021-07-16T13:17:09+09:00";
-            rev = "cafaaabe63c124bf0714f89ec715cfe9ece87fa2";
-          };
-        }
-      ];
+      map
+        (getAttrs [
+          "name"
+          "src"
+        ])
+        (
+          with pkgs.fishPlugins;
+          [
+            fzf-fish
+            autopair
+            hydro
+            {
+              name = "ghq";
+              src = pkgs.fetchFromGitHub {
+                owner = "decors";
+                repo = "fish-ghq";
+                sha256 = "0cv7jpvdfdha4hrnjr887jv1pc6vcrxv2ahy7z6x562y7fd77gg9";
+                # date = "2021-07-16T13:17:09+09:00";
+                rev = "cafaaabe63c124bf0714f89ec715cfe9ece87fa2";
+              };
+            }
+          ]
+        );
     interactiveShellInit = ''
       bind \es __ghq_repository_search
       # don't bind ctrl-t, it does nice things on macOS/BSD