From 5ec7ee21e036f7bc1cbdec714271c619cb3fdb3d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 27 Oct 2024 20:12:19 -0400
Subject: modules: restructure (#487)

* seth: remove unused pkgs

* modules: restructure

from archetypes back to profiles
make less actual modules for everything
use lib.mkDefault like it's supposed to
move mixins out of server

* nixos/resolved: use modern options
---
 systems/atlas/default.nix      |  3 +--
 systems/caroline/default.nix   |  2 +-
 systems/glados-wsl/default.nix | 21 +++++++++------------
 systems/glados/default.nix     |  7 +++++--
 4 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'systems')

diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix
index 70f7c86..7e7bfe7 100644
--- a/systems/atlas/default.nix
+++ b/systems/atlas/default.nix
@@ -11,8 +11,7 @@
     inputs.self.nixosModules.default
   ];
 
-  archetypes.server.enable = true;
-  base.networking.enable = false;
+  profiles.server.enable = true;
 
   boot = {
     loader.systemd-boot.enable = true;
diff --git a/systems/caroline/default.nix b/systems/caroline/default.nix
index 263d3dd..9e32db3 100644
--- a/systems/caroline/default.nix
+++ b/systems/caroline/default.nix
@@ -4,7 +4,7 @@
     inputs.self.darwinModules.default
   ];
 
-  archetypes.personal.enable = true;
+  profiles.personal.enable = true;
 
   homebrew.casks = [
     "altserver"
diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index 5c93ccb..b8b1cf1 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -5,17 +5,7 @@
     inputs.self.nixosModules.default
   ];
 
-  archetypes.personal.enable = true;
-
-  base = {
-    # this conflicts with nixos-wsl
-    networking.enable = false;
-    security = {
-      # something, something `resolv.conf` error
-      # (nixos-wsl probably doesn't set it)
-      apparmor = false;
-    };
-  };
+  profiles.personal.enable = true;
 
   environment.systemPackages = with pkgs; [
     wget
@@ -26,9 +16,16 @@
 
   nixpkgs.hostPlatform = "x86_64-linux";
 
+  # Something, something `resolv.conf` error
+  # (nixos-wsl probably doesn't set it)
+  security.apparmor.enable = false;
+
   system.stateVersion = "23.11";
 
-  traits.tailscale.enable = true;
+  traits = {
+    resolved.enable = false;
+    tailscale.enable = true;
+  };
 
   wsl = {
     enable = true;
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index 157ab90..3de6a8a 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -7,7 +7,7 @@
     inputs.self.nixosModules.default
   ];
 
-  archetypes.personal.enable = true;
+  profiles.personal.enable = true;
 
   desktop = {
     enable = true;
@@ -16,7 +16,10 @@
 
   environment.systemPackages = [ pkgs.obs-studio ];
 
-  networking.hostName = "glados";
+  networking = {
+    hostName = "glados";
+    networkmanager.enable = true;
+  };
 
   security.tpm2 = {
     enable = true;
-- 
cgit v1.2.3