home/fish: add more shellabbrs

home/applications/fish/default.nix

@@ -19,35 +19,55 @@
       end
     '';
 
-    plugins = [
+    plugins =
-      {
+      lib.map
-        name = "autopair";
+        (f: {
-        inherit (pkgs.fishPlugins.autopair) src;
+          name = f.pname;
-      }
+          inherit (f) src;
-      {
+        })
-        name = "done";
+        (
-        inherit (pkgs.fishPlugins.done) src;
+          with pkgs.fishPlugins;
-      }
+          [
-      {
+            autopair
-        name = "puffer";
+            done
-        inherit (pkgs.fishPlugins.puffer) src;
+            puffer
-      }
+          ]
-    ];
+        );
 
-    shellAbbrs = {
+    shellAbbrs =
+      let
+        cursor = f: {
+          setCursor = true;
+          expansion = f;
+        };
+      in
+      {
         gi = "gitui";
-      n = "nvim";
+        p = "powerprofilesctl";
         s = "nh os switch";
+        v = "nvim";
 
+        # TODO: maybe fishPlugins.fish-git-abbr?
         g = "git";
         ga = "git add";
-      gc = "git commit -m";
+        gac = cursor "git commit -am '%'";
+        gc = cursor "git commit -m '%'";
         gca = "git commit --amend";
         gd = "git diff";
         gds = "git diff --staged";
         gl = "git log";
-      gp = "git push";
+        gp = "git pull";
+        gpu = "git push";
         gr = "git rebase -i --autosquash";
+
+        n = "nix";
+        nb = cursor "nix build nixpkgs#%";
+        nr = cursor "nix run nixpkgs#%";
+        ns = cursor "nix shell nixpkgs#%";
+        nbb = "nix-build -A";
+        nf = "nix fmt";
+        nu = "nix flake update";
+        nv = "nix eval";
       };
 
     functions =