Spring Cleaning

- create new module, `system`, that consumes the `boot` module and takes
in the more system-interested services from the `services` module
- touch up left over services (which are more self-hosting interested)
- touch up yo and yoshi configs

1 files changed, 9 insertions, 17 deletions

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index b122e5e..abf38fb 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -2,10 +2,7 @@
   collinux = {
     theme = "catppuccin";
 
-    user = {
-      name = "collin";
-      useRun0 = true;
-    };
+    user.useRun0 = true;
 
     desktop = {
       wallpaper = ./wallpapers/abstract-swirls.jpg;
@@ -32,16 +29,17 @@
       };
     };
 
-    services = {
-      audio.enable = true;
-      networking = {
-        enable = true;
+    system = {
+      boot = {
+        systemd-boot.enable = true;
+        secureBoot.enable = true;
+      };
 
+      network = {
         iwd.enable = true;
-        networkd = {
-          enable = true;
-        };
+        networkd.enable = true;
       };
+      audio.enable = true;
       bluetooth.enable = true;
     };
 
@@ -62,7 +60,6 @@
         tmux.enable = true;
 
         lazygit.enable = true;
-        # nh.enable = true;
         git = {
           enable = true;
           userName = "Collin Williams";
@@ -71,10 +68,5 @@
         };
       };
     };
-
-    boot = {
-      systemd-boot.enable = true;
-      secureBoot.enable = true;
-    };
   };
 }