diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-05-13 01:22:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-13 01:22:34 +0200 |
| commit | 5a9b28e88bc7e523b5eee262183b1d5faef8604a (patch) | |
| tree | 2bee3fe1210fb047ff89119cc4be85407ecf0607 /nixos | |
| parent | c5108122c90bc3b77a45f1e6ba1393a32c33cff9 (diff) | |
| parent | d0e35cbd3ed73136cc92ac149df3cc0da3649940 (diff) | |
Merge pull request #311197 from endocrimes/dani/fish-boogaloo
nixos/fish: Fix more lib references
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/fish.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index b5a2d7d21c23e..5a6fdb9b5ec5a 100644 --- 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; |