diff --git a/default.nix b/default.nix index ca69f07ef31c..fda19c3a149f 100644 --- a/default.nix +++ b/default.nix @@ -1,15 +1,12 @@ { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" -, extraModulesPath ? builtins.getEnv "NIXOS_EXTRA_MODULES" , system ? builtins.currentSystem }: let - extraModules = if extraModulesPath == "" then [] else import extraModulesPath; - eval = import ./lib/eval-config.nix { inherit system; - modules = [ configuration ] ++ extraModules; + modules = [ configuration ]; }; inherit (eval) config pkgs; @@ -17,7 +14,7 @@ let # This is for `nixos-rebuild build-vm'. vmConfig = (import ./lib/eval-config.nix { inherit system; - modules = [ configuration ./modules/virtualisation/qemu-vm.nix ] ++ extraModules; + modules = [ configuration ./modules/virtualisation/qemu-vm.nix ]; }).config; # This is for `nixos-rebuild build-vm-with-bootloader'. @@ -27,7 +24,7 @@ let [ configuration ./modules/virtualisation/qemu-vm.nix { virtualisation.useBootLoader = true; } - ] ++ extraModules; + ]; }).config; in diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix index aac592619c52..76c325d8d8f6 100644 --- a/modules/security/sudo.nix +++ b/modules/security/sudo.nix @@ -35,7 +35,6 @@ in # Environment variables to keep for root and %wheel. Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE Defaults:root,%wheel env_keep+=NIX_PATH - Defaults:root,%wheel env_keep+=NIXOS_EXTRA_MODULES Defaults:root,%wheel env_keep+=TERMINFO_DIRS # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.