diff --git a/home/base/desktop/shell.nix b/home/base/desktop/shell.nix index bfd137d3..a5c2a79e 100644 --- a/home/base/desktop/shell.nix +++ b/home/base/desktop/shell.nix @@ -1,5 +1,5 @@ {pkgs-unstable, ...}: let - nu_scripts = pkgs-unstable.nu_scripts; + inherit (pkgs-unstable) nu_scripts; in { programs.bash = { # load the alias file for work diff --git a/home/base/server/shells/default.nix b/home/base/server/shells/default.nix index 8bbc1cb1..1a2dc205 100644 --- a/home/base/server/shells/default.nix +++ b/home/base/server/shells/default.nix @@ -12,7 +12,7 @@ in { programs.nushell = { enable = true; configFile.source = ./config.nu; - shellAliases = shellAliases; + inherit shellAliases; }; programs.bash = { diff --git a/home/darwin/shell.nix b/home/darwin/shell.nix index aab02675..0d642636 100644 --- a/home/darwin/shell.nix +++ b/home/darwin/shell.nix @@ -14,6 +14,6 @@ in { }; programs.zsh = { enable = true; - envExtra = envExtra; + inherit envExtra; }; } diff --git a/lib/attrs.nix b/lib/attrs.nix index 52e6d69f..d87d8a86 100644 --- a/lib/attrs.nix +++ b/lib/attrs.nix @@ -12,7 +12,7 @@ # (name: value: ("bar-" + value)) # { x = "a"; y = "b"; } # => { foo = "bar-a"; foo = "bar-b"; } - mapAttrs = lib.attrsets.mapAttrs; + inherit (lib.attrsets) mapAttrs; # Update both the names and values of the given attribute set. # @@ -20,7 +20,7 @@ # (name: value: nameValuePair ("foo_" + name) ("bar-" + value)) # { x = "a"; y = "b"; } # => { foo_x = "bar-a"; foo_y = "bar-b"; } - mapAttrs' = lib.attrsets.mapAttrs'; + inherit (lib.attrsets) mapAttrs'; # Merge a list of attribute sets into one. smilar to the operator `a // b`, but for a list of attribute sets. # NOTE: the later attribute set overrides the former one! @@ -28,7 +28,7 @@ # mergeAttrsList # [ { x = "a"; y = "b"; } { x = "c"; z = "d"; } { g = "e"; } ] # => { x = "c"; y = "b"; z = "d"; g = "e"; } - mergeAttrsList = lib.attrsets.mergeAttrsList; + inherit (lib.attrsets) mergeAttrsList; # Generate a string from an attribute set. # @@ -42,5 +42,5 @@ # export x=a # export y=b # ```` - foldlAttrs = lib.attrsets.foldlAttrs; + inherit (lib.attrsets) foldlAttrs; }