diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 691150a..05d9821 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -5,9 +5,9 @@ # Include the results of the hardware scan. "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix - ./hardware-configuration.nix ./network-configuration.nix - ../../modules + ./hardware-configuration.nix + ./../../modules/core/configuration.nix ]; # Enable swap on luks diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index c4c3fab..59d9e29 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -2,11 +2,10 @@ { imports = [ - - ./display.nix ./services.nix + ./display.nix + ./home.nix ./packages - ]; security = { diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 82c5eee..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - - import = [ - ./core - ./home.nix - ]; - -}