modules/nixos+darwin: make everything an actual module again

3 files changed, 39 insertions, 34 deletions

diff --git a/systems/common.nix b/systems/common.nix
index 9271b20..4e69f42 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -13,16 +13,16 @@
       extraSpecialArgs = {inherit inputs inputs' self;};
     };
   };
+
+  nixosModules = builtins.attrValues self.nixosModules;
+  darwinModules = builtins.attrValues self.darwinModules;
 in {
   personal =
-    (with inputs; [
-      agenix.nixosModules.default
-      catppuccin.nixosModules.catppuccin
-      hm.nixosModules.home-manager
-    ])
+    nixosModules
     ++ [
-      self.nixosModules.default
-      self.nixosModules.features
+      inputs.agenix.nixosModules.default
+      inputs.catppuccin.nixosModules.catppuccin
+      inputs.hm.nixosModules.home-manager
 
       hmSetup
 
@@ -39,28 +39,34 @@ in {
       })
     ];
 
-  darwin = [
-    inputs.hm.darwinModules.home-manager
-    self.darwinModules.default
-    self.darwinModules.desktop
+  darwin =
+    darwinModules
+    ++ [
+      inputs.hm.darwinModules.home-manager
+      hmSetup
 
-    hmSetup
-  ];
+      {
+        desktop.enable = true;
+      }
+    ];
 
-  server = [
-    inputs.agenix.nixosModules.default
-    self.nixosModules.default
-    self.nixosModules.features
-    self.nixosModules.server
-    self.nixosModules.services
+  server =
+    nixosModules
+    ++ [
+      inputs.agenix.nixosModules.default
 
-    {
-      features.tailscale = {
-        enable = true;
-        ssh.enable = true;
-      };
+      {
+        features.tailscale = {
+          enable = true;
+          ssh.enable = true;
+        };
+
+        server = {
+          enable = true;
+          secrets.enable = true;
+        };
 
-      nix.registry.n.flake = inputs.nixpkgs-stable;
-    }
-  ];
+        nix.registry.n.flake = inputs.nixpkgs-stable;
+      }
+    ];
 }
diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index 569ab64..4c61156 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -7,10 +7,7 @@
 }: {
   imports = [
     (modulesPath + "/profiles/minimal.nix")
-
     inputs.nixos-wsl.nixosModules.wsl
-
-    ../../modules/nixos/features/tailscale.nix
   ];
 
   documentation = {
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index 717e371..4b43bcc 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  self,
   inputs,
   ...
 }: {
@@ -10,13 +9,16 @@
     ./nvidia.nix
 
     inputs.nixos-hardware.nixosModules.common-pc-ssd
-    self.nixosModules.desktop
-    self.nixosModules.gnome
   ];
 
+  desktop = {
+    enable = true;
+    gnome.enable = true;
+  };
+
   features = {
+    containers.enable = true;
     tailscale.enable = true;
-    virtualisation.enable = true;
   };
 
   home-manager.users.seth = {