diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix deleted file mode 100644 index 05719d1..0000000 --- a/hosts/hades/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - pkgs, - lib, - self, - ... -}: -{ - imports = [ - ./hardware - ./network - ./radeon - ]; - - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - - networking.hostName = "hades"; - - security.tpm2.enable = true; - - # for SSD/NVME - services.fstrim.enable = true; - -} diff --git a/home/default.nix b/modules/home/default.nix similarity index 100% rename from home/default.nix rename to modules/home/default.nix diff --git a/home/terminal/default.nix b/modules/home/terminal/default.nix similarity index 100% rename from home/terminal/default.nix rename to modules/home/terminal/default.nix diff --git a/home/terminal/fish.nix b/modules/home/terminal/fish.nix similarity index 100% rename from home/terminal/fish.nix rename to modules/home/terminal/fish.nix diff --git a/home/terminal/kitty.nix b/modules/home/terminal/kitty.nix similarity index 100% rename from home/terminal/kitty.nix rename to modules/home/terminal/kitty.nix diff --git a/home/terminal/programs/default.nix b/modules/home/terminal/programs/default.nix similarity index 100% rename from home/terminal/programs/default.nix rename to modules/home/terminal/programs/default.nix diff --git a/hosts/default.nix b/modules/hosts/default.nix similarity index 100% rename from hosts/default.nix rename to modules/hosts/default.nix diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index d63326a..05719d1 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -1,7 +1,23 @@ -{ self, inputs, ... }: { - flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { - modules = [ - self.nixosModules.hadesConfiguration - ]; - }; +{ + pkgs, + lib, + self, + ... +}: +{ + imports = [ + ./hardware + ./network + ./radeon + ]; + + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + + networking.hostName = "hades"; + + security.tpm2.enable = true; + + # for SSD/NVME + services.fstrim.enable = true; + } diff --git a/hosts/hades/hardware.nix b/modules/hosts/hades/hardware.nix similarity index 100% rename from hosts/hades/hardware.nix rename to modules/hosts/hades/hardware.nix diff --git a/hosts/hades/network.nix b/modules/hosts/hades/network.nix similarity index 100% rename from hosts/hades/network.nix rename to modules/hosts/hades/network.nix diff --git a/hosts/hades/radeon.nix b/modules/hosts/hades/radeon.nix similarity index 100% rename from hosts/hades/radeon.nix rename to modules/hosts/hades/radeon.nix diff --git a/modules/hosts/hades/configuration.nix b/modules/hosts2/hades/configuration.nix similarity index 100% rename from modules/hosts/hades/configuration.nix rename to modules/hosts2/hades/configuration.nix diff --git a/modules/hosts2/hades/default.nix b/modules/hosts2/hades/default.nix new file mode 100644 index 0000000..d63326a --- /dev/null +++ b/modules/hosts2/hades/default.nix @@ -0,0 +1,7 @@ +{ self, inputs, ... }: { + flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { + modules = [ + self.nixosModules.hadesConfiguration + ]; + }; +} diff --git a/system/core/default.nix b/modules/system/core/default.nix similarity index 100% rename from system/core/default.nix rename to modules/system/core/default.nix diff --git a/system/core/users.nix b/modules/system/core/users.nix similarity index 100% rename from system/core/users.nix rename to modules/system/core/users.nix diff --git a/system/default.nix b/modules/system/default.nix similarity index 100% rename from system/default.nix rename to modules/system/default.nix diff --git a/boilerplate.nix b/resources/maintenance/boilerplate.nix similarity index 100% rename from boilerplate.nix rename to resources/maintenance/boilerplate.nix diff --git a/resources/maintenance/credits.md b/resources/maintenance/credits.md new file mode 100644 index 0000000..d79d075 --- /dev/null +++ b/resources/maintenance/credits.md @@ -0,0 +1 @@ +TO DO diff --git a/structure.md b/resources/maintenance/structure.md similarity index 100% rename from structure.md rename to resources/maintenance/structure.md