diff options
author | aszlig <aszlig@nix.build> | 2021-07-09 18:18:18 +0200 |
---|---|---|
committer | aszlig <aszlig@nix.build> | 2021-07-09 18:18:18 +0200 |
commit | c89926d374905a1e012a8541481aefad8069fc68 (patch) | |
tree | 617037ec7b35dd2a6dc1802a16e01f13a344c008 /modules/core/common.nix | |
parent | e1c06c44ae1bd32b66dbbb50bf8cd1e488f12463 (diff) |
modules/core: Get rid of "with lib;"
This makes it hard to do static analysis on the code and it's really not needed here, so let's use lib.X directly. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules/core/common.nix')
-rw-r--r-- | modules/core/common.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/core/common.nix b/modules/core/common.nix index 3f9f4f5f..acf00a60 100644 --- a/modules/core/common.nix +++ b/modules/core/common.nix @@ -1,8 +1,7 @@ { config, pkgs, lib, ... }: -with lib; - let + inherit (lib) mkOption types; rootChannelsPath = "/nix/var/nix/profiles/per-user/root/channels"; channelPath = "${rootChannelsPath}/${config.vuizvui.channelName}"; @@ -25,8 +24,8 @@ in { description = '' Enabling this links <literal>nixos-config</literal> to be used by <literal>nixpkgs-config</literal>, which essentially means that - attributes defined in <option>nixpkgs.config</option> are also in effect - for user environments. + attributes defined in <option>nixpkgs.config</option> are also in + effect for user environments. ''; }; @@ -51,12 +50,13 @@ in { ]; environment.variables.NIXPKGS_CONFIG = let + inherit (config.vuizvui) enableGlobalNixpkgsConfig; nixpkgsCfg = toString (pkgs.writeText "nixpkgs-try-config.nix" '' if (builtins.tryEval <nixpkgs-config>).success then import <nixpkgs-config> else {} ''); - in mkIf config.vuizvui.enableGlobalNixpkgsConfig (mkForce nixpkgsCfg); + in lib.mkIf enableGlobalNixpkgsConfig (lib.mkForce nixpkgsCfg); nix.nixPath = let nixosConfig = "/etc/nixos/configuration.nix"; @@ -70,11 +70,11 @@ in { "nixpkgs=${channelPath}/nixpkgs" "nixos-config=${nixosConfig}" rootChannelsPath - ] ++ optional config.vuizvui.enableGlobalNixpkgsConfig nixpkgsConfig; - in mkIf config.vuizvui.modifyNixPath (mkOverride 90 nixPath); + ] ++ lib.optional config.vuizvui.enableGlobalNixpkgsConfig nixpkgsConfig; + in lib.mkIf config.vuizvui.modifyNixPath (lib.mkOverride 90 nixPath); # correct path used by command-not-found which is enabled by default programs.command-not-found.dbPath = - mkDefault "${channelPath}/nixpkgs/programs.sqlite"; + lib.mkDefault "${channelPath}/nixpkgs/programs.sqlite"; }; } |