make everything a module

5 files changed, 9 insertions, 74 deletions

diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix
index 55d46b3..5b27856 100644
--- a/systems/atlas/default.nix
+++ b/systems/atlas/default.nix
@@ -10,6 +10,8 @@
     ./teawiebot.nix
   ];
 
+  suites.server.enable = true;
+
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
diff --git a/systems/caroline/default.nix b/systems/caroline/default.nix
index 160a4fc..8e14515 100644
--- a/systems/caroline/default.nix
+++ b/systems/caroline/default.nix
@@ -1,4 +1,6 @@
 {
+  suites.personal.enable = true;
+
   homebrew.casks = [
     "altserver"
     "discord"
diff --git a/systems/common.nix b/systems/common.nix
deleted file mode 100644
index 7483474..0000000
--- a/systems/common.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  inputs,
-  self,
-}: let
-  hmSetup = {inputs', ...}: {
-    imports = [
-      ../users/seth/system.nix
-    ];
-
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-      extraSpecialArgs = {inherit inputs inputs' self;};
-    };
-  };
-
-  nixosModules = builtins.attrValues self.nixosModules;
-  darwinModules = builtins.attrValues self.darwinModules;
-in {
-  personal =
-    nixosModules
-    ++ [
-      inputs.agenix.nixosModules.default
-      inputs.catppuccin.nixosModules.catppuccin
-      inputs.hm.nixosModules.home-manager
-
-      hmSetup
-
-      ({secretsDir, ...}: {
-        age = {
-          identityPaths = ["/etc/age/key"];
-          secrets = {
-            rootPassword.file = secretsDir + "/rootPassword.age";
-            sethPassword.file = secretsDir + "/sethPassword.age";
-          };
-        };
-
-        services.nixseparatedebuginfod.enable = true;
-      })
-    ];
-
-  darwin =
-    darwinModules
-    ++ [
-      inputs.hm.darwinModules.home-manager
-      hmSetup
-
-      {
-        desktop.enable = true;
-      }
-    ];
-
-  server =
-    nixosModules
-    ++ [
-      inputs.agenix.nixosModules.default
-
-      {
-        features.tailscale = {
-          enable = true;
-          ssh.enable = true;
-        };
-
-        server = {
-          enable = true;
-          secrets.enable = true;
-        };
-
-        nix.registry.n.flake = inputs.nixpkgs-stable;
-        environment.etc."nix/inputs/nixpkgs".source = inputs.nixpkgs-stable.outPath;
-      }
-    ];
-}
diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index 4c61156..d42e69f 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -10,6 +10,8 @@
     inputs.nixos-wsl.nixosModules.wsl
   ];
 
+  suites.personal.enable = true;
+
   documentation = {
     enable = lib.mkForce true;
     man.enable = lib.mkForce true;
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index 4b43bcc..c516b07 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -11,6 +11,8 @@
     inputs.nixos-hardware.nixosModules.common-pc-ssd
   ];
 
+  suites.personal.enable = true;
+
   desktop = {
     enable = true;
     gnome.enable = true;
@@ -22,7 +24,7 @@
   };
 
   home-manager.users.seth = {
-    desktop.enable = true;
+    seth.desktop.enable = true;
   };
 
   networking.hostName = "glados";