fish: added abbr.name option

Author: SandWoodJones

modules/programs/fish.nix

@@ -166,6 +166,14 @@ let
 
   abbrModule = types.submodule {
     options = {
+      name = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          The abbreviation name that is replaced by the expansion.
+        '';
+      };
+
       expansion = mkOption {
         type = with types; nullOr str;
         default = null;
@@ -289,8 +297,9 @@ let
 
   abbrsStr = lib.concatStringsSep "\n" (
     lib.mapAttrsToList (
-      name: def:
+      attrName: def:
       let
+        name = if isAttrs def && def.name != null then def.name else attrName;
         mods =
           lib.cli.toGNUCommandLineShell
             {

tests/modules/programs/fish/abbrs.nix

@@ -39,13 +39,19 @@
           command = "git";
           expansion = "checkout";
         };
-        s = {
+        status = {
+          name = "s";
           command = [
             "git"
             "hg"
           ];
           expansion = "status";
         };
+        show = {
+          name = "s";
+          command = "systemctl";
+          expansion = "show";
+        };
         dotdot = {
           regex = "^\\.\\.+$";
           function = "multicd";
@@ -79,6 +85,8 @@
           "abbr --add --command git -- co checkout"
         assertFileContains home-files/.config/fish/config.fish \
           "abbr --add --command git --command hg -- s status"
+        assertFileContains home-files/.config/fish/config.fish \
+          "abbr --add --command systemctl -- s show"
         assertFileContains home-files/.config/fish/config.fish \
           "abbr --add --function multicd --regex '^\.\.+$' -- dotdot"
       '';