From b45299bdc8eb3c10754fe8380c417ca9f9589c9f Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Mon, 3 Feb 2025 16:26:41 -0800 Subject: Modularize configuration more --- nix/flake.nix | 4 +--- nix/modules/default.nix | 1 - nix/systems/affinity/default.nix | 2 ++ nix/systems/continuity/default.nix | 2 ++ nix/systems/spontaneity/default.nix | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) (limited to 'nix') diff --git a/nix/flake.nix b/nix/flake.nix index 50febed..950e86a 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -52,7 +52,6 @@ { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/sda-simple.nix ./systems/continuity/default.nix ]; }; @@ -67,7 +66,7 @@ sops-nix.nixosModules.sops { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/nvme-simple.nix + ./systems/affinity/default.nix ]; }; @@ -82,7 +81,6 @@ sops-nix.nixosModules.sops { nixpkgs.overlays = [ nur.overlays.default ]; } { home-manager.extraSpecialArgs = attrs; } - ./modules/vda-simple.nix ./systems/spontaneity/default.nix ]; }; diff --git a/nix/modules/default.nix b/nix/modules/default.nix index 4284348..ad4ccd3 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -2,7 +2,6 @@ { imports = [ ./configuration.nix - ./home/home.nix ./vars.nix ]; diff --git a/nix/systems/affinity/default.nix b/nix/systems/affinity/default.nix index 205fb11..4423440 100644 --- a/nix/systems/affinity/default.nix +++ b/nix/systems/affinity/default.nix @@ -2,6 +2,8 @@ { imports = [ ../../modules/default.nix + ../../modules/home/home.nix + ../../modules/nvme-simple.nix ]; config.monorepo = { profiles = { diff --git a/nix/systems/continuity/default.nix b/nix/systems/continuity/default.nix index 3a4043c..1bff83c 100644 --- a/nix/systems/continuity/default.nix +++ b/nix/systems/continuity/default.nix @@ -2,5 +2,7 @@ { imports = [ ../../modules/default.nix + ../../modules/home/home.nix + ../../modules/sda-simple.nix ]; } diff --git a/nix/systems/spontaneity/default.nix b/nix/systems/spontaneity/default.nix index 89b3ce6..bc7ba81 100644 --- a/nix/systems/spontaneity/default.nix +++ b/nix/systems/spontaneity/default.nix @@ -2,11 +2,12 @@ { imports = [ ../../modules/default.nix + ../../modules/vda-simple.nix ]; config.monorepo = { profiles = { - home.enable = false; server.enable = true; + home.enable = false; }; vars.hostName = "spontaneity"; }; -- cgit