diff --git a/core/default.nix b/core/default.nix index 99530a9..2f89bf5 100755 --- a/core/default.nix +++ b/core/default.nix @@ -8,7 +8,7 @@ inputs.home-manager.nixosModules.home-manager ## Semi-modularised config - ./modules/shared # additional modules to import + ./modules # additional modules to import ../home # user-level packages in ../home/programs/ ]; diff --git a/core/hosts/hades/default.nix b/core/hosts/hades/default.nix index 105fb1c..8356825 100755 --- a/core/hosts/hades/default.nix +++ b/core/hosts/hades/default.nix @@ -10,9 +10,9 @@ ## Shared 'core' config options ../../../core ## Host-specific core modules - ../../../core/modules/optional/zfs.nix - ../../../core/modules/optional/gaming.nix - ../../../core/modules/optional/jellyfin.nix + ../../../core/modules/zfs.nix + ../../../core/modules/gaming.nix + ../../../core/modules/jellyfin.nix ]; diff --git a/core/modules/shared/audio.nix b/core/modules/audio.nix similarity index 100% rename from core/modules/shared/audio.nix rename to core/modules/audio.nix diff --git a/core/modules/shared/default.nix b/core/modules/default.nix similarity index 100% rename from core/modules/shared/default.nix rename to core/modules/default.nix diff --git a/core/modules/shared/display.nix b/core/modules/display.nix similarity index 100% rename from core/modules/shared/display.nix rename to core/modules/display.nix diff --git a/core/modules/optional/gaming.nix b/core/modules/gaming.nix similarity index 100% rename from core/modules/optional/gaming.nix rename to core/modules/gaming.nix diff --git a/core/modules/optional/jellyfin.nix b/core/modules/jellyfin.nix similarity index 100% rename from core/modules/optional/jellyfin.nix rename to core/modules/jellyfin.nix diff --git a/core/modules/shared/ly.nix b/core/modules/ly.nix similarity index 100% rename from core/modules/shared/ly.nix rename to core/modules/ly.nix diff --git a/core/modules/shared/packages.nix b/core/modules/packages.nix similarity index 100% rename from core/modules/shared/packages.nix rename to core/modules/packages.nix diff --git a/core/modules/shared/regreet.nix b/core/modules/regreet.nix similarity index 100% rename from core/modules/shared/regreet.nix rename to core/modules/regreet.nix diff --git a/core/modules/shared/sync.nix b/core/modules/sync.nix similarity index 100% rename from core/modules/shared/sync.nix rename to core/modules/sync.nix diff --git a/core/modules/optional/zfs.nix b/core/modules/zfs.nix similarity index 100% rename from core/modules/optional/zfs.nix rename to core/modules/zfs.nix