From a905e2dc3d807c5f0f31d00f60795135c4a57b97 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 12:00:54 +1000 Subject: [PATCH] changed structure quite significantly --- home/default.nix | 7 ------- hosts/proserpina/configuration.nix | 2 +- configuration.nix => modules/core/configuration.nix | 0 modules/core/default.nix | 10 ++++++++++ modules/{ => core}/network/default.nix | 0 modules/{ => core}/packages/default.nix | 0 modules/{ => core}/packages/packages.nix | 0 modules/{ => core}/services/default.nix | 0 modules/default.nix | 7 +++---- {home => modules}/home.nix | 2 +- {home/dots => modules/home}/default.nix | 0 {home/dots => modules/home}/git/default.nix | 0 {home/dots => modules/home}/hyprland/default.nix | 0 {home/dots => modules/home}/hyprland/environment.nix | 0 {home/dots => modules/home}/kitty/default.nix | 0 {home/dots => modules/home}/misc/default.nix | 0 {home => modules}/users/default.nix | 0 {home => modules}/users/serenity.nix | 0 18 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 home/default.nix rename configuration.nix => modules/core/configuration.nix (100%) create mode 100644 modules/core/default.nix rename modules/{ => core}/network/default.nix (100%) rename modules/{ => core}/packages/default.nix (100%) rename modules/{ => core}/packages/packages.nix (100%) rename modules/{ => core}/services/default.nix (100%) rename {home => modules}/home.nix (98%) rename {home/dots => modules/home}/default.nix (100%) rename {home/dots => modules/home}/git/default.nix (100%) rename {home/dots => modules/home}/hyprland/default.nix (100%) rename {home/dots => modules/home}/hyprland/environment.nix (100%) rename {home/dots => modules/home}/kitty/default.nix (100%) rename {home/dots => modules/home}/misc/default.nix (100%) rename {home => modules}/users/default.nix (100%) rename {home => modules}/users/serenity.nix (100%) diff --git a/home/default.nix b/home/default.nix deleted file mode 100644 index 6549b63..0000000 --- a/home/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - - import = [ - ./home.nix - ]; - -} diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 2bf3ebb..065a776 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -6,7 +6,7 @@ "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix ./hardware-configuration.nix - ../../configuration.nix + ../../modules ]; # Enable swap on luks diff --git a/configuration.nix b/modules/core/configuration.nix similarity index 100% rename from configuration.nix rename to modules/core/configuration.nix diff --git a/modules/core/default.nix b/modules/core/default.nix new file mode 100644 index 0000000..36d74a3 --- /dev/null +++ b/modules/core/default.nix @@ -0,0 +1,10 @@ +{ + + imports = [ + ./configuration.nix + ./services + ./packages + ./network + ]; + +} diff --git a/modules/network/default.nix b/modules/core/network/default.nix similarity index 100% rename from modules/network/default.nix rename to modules/core/network/default.nix diff --git a/modules/packages/default.nix b/modules/core/packages/default.nix similarity index 100% rename from modules/packages/default.nix rename to modules/core/packages/default.nix diff --git a/modules/packages/packages.nix b/modules/core/packages/packages.nix similarity index 100% rename from modules/packages/packages.nix rename to modules/core/packages/packages.nix diff --git a/modules/services/default.nix b/modules/core/services/default.nix similarity index 100% rename from modules/services/default.nix rename to modules/core/services/default.nix diff --git a/modules/default.nix b/modules/default.nix index 8c2ea07..82c5eee 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,9 +1,8 @@ { - imports = [ - ./services - ./packages - ./network + import = [ + ./core + ./home.nix ]; } diff --git a/home/home.nix b/modules/home.nix similarity index 98% rename from home/home.nix rename to modules/home.nix index 8b2dff6..3ae52d2 100755 --- a/home/home.nix +++ b/modules/home.nix @@ -4,7 +4,7 @@ imports = [ # ./users - ./dots + ./home ]; programs.home-manager.enable = true; diff --git a/home/dots/default.nix b/modules/home/default.nix similarity index 100% rename from home/dots/default.nix rename to modules/home/default.nix diff --git a/home/dots/git/default.nix b/modules/home/git/default.nix similarity index 100% rename from home/dots/git/default.nix rename to modules/home/git/default.nix diff --git a/home/dots/hyprland/default.nix b/modules/home/hyprland/default.nix similarity index 100% rename from home/dots/hyprland/default.nix rename to modules/home/hyprland/default.nix diff --git a/home/dots/hyprland/environment.nix b/modules/home/hyprland/environment.nix similarity index 100% rename from home/dots/hyprland/environment.nix rename to modules/home/hyprland/environment.nix diff --git a/home/dots/kitty/default.nix b/modules/home/kitty/default.nix similarity index 100% rename from home/dots/kitty/default.nix rename to modules/home/kitty/default.nix diff --git a/home/dots/misc/default.nix b/modules/home/misc/default.nix similarity index 100% rename from home/dots/misc/default.nix rename to modules/home/misc/default.nix diff --git a/home/users/default.nix b/modules/users/default.nix similarity index 100% rename from home/users/default.nix rename to modules/users/default.nix diff --git a/home/users/serenity.nix b/modules/users/serenity.nix similarity index 100% rename from home/users/serenity.nix rename to modules/users/serenity.nix