From 19f5401986af98cc2b654d654cb67bad87127995 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Tue, 25 Mar 2025 22:20:53 +1000 Subject: [PATCH] rearranged core directory --- core/{modules => }/audio.nix | 0 core/default.nix | 7 ++++++- core/{modules => }/display.nix | 0 core/{modules => }/gaming.nix | 0 core/hosts/hades/default.nix | 10 +++++----- core/{modules => }/jellyfin.nix | 0 core/modules/default.nix | 14 -------------- core/{modules => }/packages.nix | 0 core/{modules => }/regreet.nix | 0 core/{modules => }/sync.nix | 0 core/{modules => }/zfs.nix | 0 11 files changed, 11 insertions(+), 20 deletions(-) rename core/{modules => }/audio.nix (100%) rename core/{modules => }/display.nix (100%) rename core/{modules => }/gaming.nix (100%) rename core/{modules => }/jellyfin.nix (100%) delete mode 100755 core/modules/default.nix rename core/{modules => }/packages.nix (100%) rename core/{modules => }/regreet.nix (100%) rename core/{modules => }/sync.nix (100%) rename core/{modules => }/zfs.nix (100%) diff --git a/core/modules/audio.nix b/core/audio.nix similarity index 100% rename from core/modules/audio.nix rename to core/audio.nix diff --git a/core/default.nix b/core/default.nix index 7db5c5b..5fa0889 100755 --- a/core/default.nix +++ b/core/default.nix @@ -8,10 +8,15 @@ inputs.home-manager.nixosModules.home-manager ## Semi-modularised config - ./modules # additional modules to import ../home # user-level packages in ../home/programs/ ../secrets # secrets :shh: + ## Shared modules to import + ./audio.nix + ./display.nix + ./regreet.nix + ./packages.nix + ]; ## Make sure this is set ! diff --git a/core/modules/display.nix b/core/display.nix similarity index 100% rename from core/modules/display.nix rename to core/display.nix diff --git a/core/modules/gaming.nix b/core/gaming.nix similarity index 100% rename from core/modules/gaming.nix rename to core/gaming.nix diff --git a/core/hosts/hades/default.nix b/core/hosts/hades/default.nix index c67d625..69dae6e 100755 --- a/core/hosts/hades/default.nix +++ b/core/hosts/hades/default.nix @@ -10,11 +10,11 @@ ## Shared 'core' config options ../../../core ## Host-specific core modules - ../../../core/modules/zfs.nix - ../../../core/modules/sync.nix - ../../../core/modules/gaming.nix - ../../../core/modules/jellyfin.nix - #../../../core/modules/bluetooth.nix + ../../../core/zfs.nix + ../../../core/sync.nix + ../../../core/gaming.nix + ../../../core/jellyfin.nix + #../../../core/bluetooth.nix ]; diff --git a/core/modules/jellyfin.nix b/core/jellyfin.nix similarity index 100% rename from core/modules/jellyfin.nix rename to core/jellyfin.nix diff --git a/core/modules/default.nix b/core/modules/default.nix deleted file mode 100755 index 7391b30..0000000 --- a/core/modules/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - - imports = [ - ## Semi-modularised config - #./sync.nix # Syncthing and gitwatch settings - ./audio.nix # Musnix and ... audio ... config - ./display.nix # Display configs - ./regreet.nix # Login greeter config - ./packages.nix # All system-level packages here - ]; - -} diff --git a/core/modules/packages.nix b/core/packages.nix similarity index 100% rename from core/modules/packages.nix rename to core/packages.nix diff --git a/core/modules/regreet.nix b/core/regreet.nix similarity index 100% rename from core/modules/regreet.nix rename to core/regreet.nix diff --git a/core/modules/sync.nix b/core/sync.nix similarity index 100% rename from core/modules/sync.nix rename to core/sync.nix diff --git a/core/modules/zfs.nix b/core/zfs.nix similarity index 100% rename from core/modules/zfs.nix rename to core/zfs.nix