5 files changed, 13 insertions, 37 deletions
diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix
index 5fd346b..1b6cbac 100644
--- a/systems/atlas/default.nix
+++ b/systems/atlas/default.nix
@@ -1,8 +1,4 @@
 {
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ./hardware-configuration.nix
     ./miniflux.nix
@@ -10,7 +6,7 @@
     ./teawiebot.nix
   ];
 
-  suites.server.enable = true;
+  archetypes.server.enable = true;
 
   boot = {
     loader.systemd-boot.enable = true;
@@ -29,12 +25,6 @@
     logrotate.checkConfig = false;
   };
 
-  users.users.atlas = {
-    isNormalUser = true;
-    shell = pkgs.bash;
-    hashedPasswordFile = config.age.secrets.userPassword.path;
-  };
-
   system.stateVersion = "23.05";
 
   zramSwap.enable = true;
diff --git a/systems/atlas/nginx.nix b/systems/atlas/nginx.nix
index 03a6fc1..f1d7409 100644
--- a/systems/atlas/nginx.nix
+++ b/systems/atlas/nginx.nix
@@ -14,15 +14,15 @@
     name: value: lib.nameValuePair "${name}.${config.networking.domain}" value
   );
 in {
-  server.services.cloudflared.enable = true;
-
   services.nginx = {
     enable = true;
 
+    recommendedBrotliSettings = true;
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
+    recommendedZstdSettings = true;
 
     virtualHosts = toVHosts {
       miniflux = {
diff --git a/systems/caroline/default.nix b/systems/caroline/default.nix
index dc9bdc8..f41ae12 100644
--- a/systems/caroline/default.nix
+++ b/systems/caroline/default.nix
@@ -1,5 +1,5 @@
 {config, ...}: {
-  suites.personal.enable = true;
+  archetypes.personal.enable = true;
 
   homebrew.casks = [
     "altserver"
diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index 7014938..a0b02bf 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -10,7 +10,12 @@
     inputs.nixos-wsl.nixosModules.wsl
   ];
 
-  suites.personal.enable = true;
+  archetypes.personal.enable = true;
+
+  base = {
+    networking.enable = false;
+    security.enable = false;
+  };
 
   documentation = {
     enable = lib.mkForce true;
@@ -25,7 +30,7 @@
     ];
   };
 
-  features.tailscale.enable = true;
+  traits.tailscale.enable = true;
 
   wsl = {
     enable = true;
@@ -39,20 +44,5 @@
     interop.includePath = false;
   };
 
-  # doesn't work on wsl
-  services.dbus.apparmor = "disabled";
-  # ditto
-  networking.networkmanager.enable = false;
-
-  # ditto
-  security = {
-    apparmor.enable = false;
-    audit.enable = false;
-    auditd.enable = false;
-  };
-
-  # ditto
-  services.resolved.enable = false;
-
   system.stateVersion = "23.11";
 }
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index a887de0..4f8af01 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -11,22 +11,18 @@
     inputs.nixos-hardware.nixosModules.common-pc-ssd
   ];
 
-  suites.personal.enable = true;
+  archetypes.personal.enable = true;
 
   desktop = {
     enable = true;
     gnome.enable = true;
   };
 
-  features = {
+  traits = {
     containers.enable = true;
     tailscale.enable = true;
   };
 
-  home-manager.users.seth = {
-    seth.desktop.enable = true;
-  };
-
   security.tpm2 = {
     enable = true;
     abrmd.enable = true;