From 8ade367d84f96f18bd6c3e203bd227732022a34c Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 25 Oct 2020 14:56:37 -0700 Subject: [PATCH] move scan import to hardware-configuration.nix to match defaults --- configuration.nix | 3 --- hardware-configuration.nix | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index 15401f1..bc5fc56 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,9 +8,6 @@ imports = [ ./hardware-configuration.nix - "${modulesPath}/installer/scan/not-detected.nix" - - # list other modules here ]; services.sshd.enable = true; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index b070f95..7831e6c 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,6 +1,20 @@ -{ ... }: +# these args are passed into every nixos module (or file that is in included in a nixos module imports=[...]) +{ + modulesPath, # this variable, in particular, gives us the nixos modules path for our system config + ... +}: { + imports = [ + # note: this format can't be used with flakes, because it pulls from + # NIX_PATH, which is impure, and dis-allowed with flakes. + # Use the format shown in the line below it. + + # + + "${modulesPath}/installer/scan/not-detected.nix" + + ] boot.loader.systemd-boot.enable = true; # (for UEFI systems only) fileSystems."/".device = "/dev/disk/by-label/nixos"; }