Merge pull request #311197 from endocrimes/dani/fish-boogaloo
nixos/fish: Fix more lib references
This commit is contained in:
commit
5a9b28e88b
@ -6,14 +6,14 @@ let
|
|||||||
|
|
||||||
cfg = config.programs.fish;
|
cfg = config.programs.fish;
|
||||||
|
|
||||||
fishAbbrs = builtins.concatStringsSep "\n" (
|
fishAbbrs = lib.concatStringsSep "\n" (
|
||||||
lib.mapAttrsFlatten (k: v: "abbr -ag ${k} ${builtins.escapeShellArg v}")
|
lib.mapAttrsFlatten (k: v: "abbr -ag ${k} ${lib.escapeShellArg v}")
|
||||||
cfg.shellAbbrs
|
cfg.shellAbbrs
|
||||||
);
|
);
|
||||||
|
|
||||||
fishAliases = builtins.concatStringsSep "\n" (
|
fishAliases = lib.concatStringsSep "\n" (
|
||||||
lib.mapAttrsFlatten (k: v: "alias ${k} ${builtins.escapeShellArg v}")
|
lib.mapAttrsFlatten (k: v: "alias ${k} ${lib.escapeShellArg v}")
|
||||||
(builtins.filterAttrs (k: v: v != null) cfg.shellAliases)
|
(lib.filterAttrs (k: v: v != null) cfg.shellAliases)
|
||||||
);
|
);
|
||||||
|
|
||||||
envShellInit = pkgs.writeText "shellInit" cfge.shellInit;
|
envShellInit = pkgs.writeText "shellInit" cfge.shellInit;
|
||||||
@ -147,7 +147,7 @@ in
|
|||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
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
|
# Required for man completions
|
||||||
documentation.man.generateCaches = lib.mkDefault true;
|
documentation.man.generateCaches = lib.mkDefault true;
|
||||||
|
Loading…
Reference in New Issue
Block a user