organize

modules/hosts/box.nix

@@ -2,17 +2,8 @@
   den.aspects.box = {
     includes = with den.aspects; [
       den.default
-      den.provides.home-manager
-
-      dns
-      openssh
 
       cloudflared
-      syncthing
-
-      catppuccin
-
-      fish
 
       portmap
       searxng

modules/hosts/common.nix

@@ -1,11 +1,7 @@
-{ den, ... }:
-{
-  den.aspects.nix = {
+{ den, ... }: {
+  den.aspects.common = {
     includes = with den.aspects; [
       den.default
-      den.provides.home-manager
-
-      nvidia
 
       cosmic
       audio
@@ -13,19 +9,10 @@
       swap
       virtualisation
 
-      dns
-      openssh
-      # cloudflare-warp
-
-      syncthing
-
       stylix
-      catppuccin
 
-      fish
       flatpak
       development
-      # cad
       compatibility
       utilities
 
@@ -36,9 +23,5 @@
       social
       gaming
     ];
-
-    nixos = {
-      networking.hostName = "nix";
-    };
   };
 }

modules/hosts/defaults.nix

@@ -1,10 +1,21 @@
 { den, ... }: {
   den.default = {
     includes = with den.aspects; [
+      den.provides.home-manager
+
       boot
       security
       locale
       essentials
+
+      dns
+      openssh
+      syncthing
+
+      catppuccin
+      fish
+
+      janitor
     ];
 
     nixos = { ... }: {
@@ -36,4 +47,4 @@
       home.stateVersion = "26.05";
     };
   };
-}
+}

modules/hosts/laptop.nix

@@ -0,0 +1,20 @@
+{ den, ... }: {
+  den.aspects.laptop = {
+    includes = with den.aspects; [
+      common
+
+      amdgpu
+      cloudflare-warp
+      cad
+    ];
+
+    nixos = {
+      networking.hostName = "nix";
+
+      services.logind.settings.Login = {
+        HandleLidSwitch = "ignore";
+        HandleLidSwitchDocked = "ignore";
+      };
+    };
+  };
+}

modules/hosts/laptop/laptop.nix

@@ -1,49 +0,0 @@
-{ den, ... }: {
-  den.aspects.laptop = {
-    includes = with den.aspects; [
-      den.default
-      den.provides.home-manager
-
-      amdgpu
-
-      cosmic
-      audio
-
-      swap
-      virtualisation
-
-      dns
-      openssh
-      cloudflare-warp
-
-      syncthing
-
-      stylix
-      catppuccin
-
-      fish
-      flatpak
-      development
-      cad
-      compatibility
-      utilities
-      janitor
-
-      firefox
-      librewolf
-
-      music
-      social
-      gaming
-    ];
-
-    nixos = {
-      networking.hostName = "nix";
-
-      services.logind.settings.Login = {
-        HandleLidSwitch = "ignore";
-        HandleLidSwitchDocked = "ignore";
-      };
-    };
-  };
-}

modules/hosts/nix.nix

@@ -0,0 +1,13 @@
+{ den, ... }: {
+  den.aspects.nix = {
+    includes = with den.aspects; [
+      common
+
+      nvidia
+    ];
+
+    nixos = {
+      networking.hostName = "nix";
+    };
+  };
+}