Merge pull request NixOS#311197 from endocrimes/dani/fish-boogaloo

nixos/fish: Fix more lib references
ju1m · May 12, 2024 · 5a9b28e · 5a9b28e
2 parents c510812 + d0e35cb
commit 5a9b28e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
@@ -6,14 +6,14 @@ let
 
   cfg = config.programs.fish;
 
-  fishAbbrs = builtins.concatStringsSep "\n" (
-    lib.mapAttrsFlatten (k: v: "abbr -ag ${k} ${builtins.escapeShellArg v}")
+  fishAbbrs = lib.concatStringsSep "\n" (
+    lib.mapAttrsFlatten (k: v: "abbr -ag ${k} ${lib.escapeShellArg v}")
       cfg.shellAbbrs
   );
 
-  fishAliases = builtins.concatStringsSep "\n" (
-    lib.mapAttrsFlatten (k: v: "alias ${k} ${builtins.escapeShellArg v}")
-      (builtins.filterAttrs (k: v: v != null) cfg.shellAliases)
+  fishAliases = lib.concatStringsSep "\n" (
+    lib.mapAttrsFlatten (k: v: "alias ${k} ${lib.escapeShellArg v}")
+      (lib.filterAttrs (k: v: v != null) cfg.shellAliases)
   );
 
   envShellInit = pkgs.writeText "shellInit" cfge.shellInit;
@@ -147,7 +147,7 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    programs.fish.shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases;
+    programs.fish.shellAliases = lib.mapAttrs (name: lib.mkDefault) cfge.shellAliases;
 
     # Required for man completions
     documentation.man.generateCaches = lib.mkDefault true;