From cffffeb678e9a1078eeba0f19c9607cda9f31bed Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 7 Feb 2024 18:03:24 -0500
Subject: modules/nixos+darwin: move to traits + archetypes model

---
 systems/atlas/default.nix | 12 +-----------
 systems/atlas/nginx.nix   |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'systems/atlas')

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 = {
-- 
cgit v1.2.3