From 06c972ef26582ebfb73fc45d86df37f621f94a23 Mon Sep 17 00:00:00 2001
From: Callum Leslie <git@cleslie.uk>
Date: Wed, 11 Sep 2024 14:05:15 +0100
Subject: [PATCH] better fish

---
 home/c/programs/fish/default.nix | 42 ++++++++++----------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/home/c/programs/fish/default.nix b/home/c/programs/fish/default.nix
index e6244c1..4b3c330 100644
--- a/home/c/programs/fish/default.nix
+++ b/home/c/programs/fish/default.nix
@@ -1,4 +1,9 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  mkFishPlug = pkg: {
+    name = pkg.pname;
+    inherit (pkg) src;
+  };
+in {
   programs.fish = {
     enable = true;
 
@@ -20,34 +25,13 @@
     };
 
     plugins = with pkgs.fishPlugins; [
-      {
-        name = "z";
-        inherit (z) src;
-      }
-      {
-        name = "hydro";
-        inherit (hydro) src;
-      }
-      {
-        name = "sponge";
-        inherit (sponge) src;
-      }
-      {
-        name = "grc";
-        inherit (grc) src;
-      }
-      {
-        name = "done";
-        inherit (done) src;
-      }
-      {
-        name = "fzf-fish";
-        inherit (fzf-fish) src;
-      }
-      {
-        name = "forgit";
-        inherit (forgit) src;
-      }
+      (mkFishPlug z)
+      (mkFishPlug hydro)
+      (mkFishPlug sponge)
+      (mkFishPlug grc)
+      (mkFishPlug done)
+      (mkFishPlug fzf-fish)
+      (mkFishPlug git-abbr)
     ];
   };
 }