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

3 files changed, 48 insertions, 45 deletions

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index e44e4a8..ba7c854 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   collinux = {
-    user.name = "collin";
+    theme = "terminal";
 
     secrets = {
       "williams-psk" = {
@@ -18,40 +18,41 @@
           userName = "Collin Williams";
           userEmail = "96917990+bluedragon1221@users.noreply.github.com";
         };
+        helix.enable = true;
       };
     };
 
-    boot.systemd-boot.enable = true;
-
-    services = {
-      networking = {
+    system.network = {
+      networkd = {
         enable = true;
-        networkd = {
-          enable = true;
-          ssid = "williams";
-          pskFile = config.collinux.secrets."williams-psk".path;
-          static = {
-            ip = "192.168.50.2/24";
-            gateway = "192.168.50.1";
-          };
-        };
-        sshd = {
-          enable = true;
-          bind_host = "0.0.0.0";
+        static = {
+          ip = "192.168.50.2/24";
+          gateway = "192.168.50.1";
         };
+
+        ssid = "williams";
+        pskFile = config.collinux.secrets."williams-psk".path;
       };
+    };
 
-      selfhost = {
-        caddy = {
-          enable = true;
-          envFile = config.collinux.secrets."caddy-env".path;
-        };
+    services = {
+      sshd = {
+        enable = true;
+        portConfig = [
+          {
+            port = 2222;
+            rootLogin = true;
+          }
+          {
+            port = 22;
+            otp = true;
+          }
+        ];
+      };
 
-        forgejo = {
-          enable = true;
-          bind_host = "127.0.0.1";
-          root_url = "ganymede.collinux.tailnet:8010";
-        };
+      caddy = {
+        enable = true;
+        envFile = config.collinux.secrets."caddy-env".path;
       };
     };
   };
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;
-    };
   };
 }
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index a9d6d08..35f21b8 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -2,7 +2,16 @@
   pkgs,
   inputs,
   ...
-}: {
+}: let
+  captiveBrowserDesktop = pkgs.makeDesktopItem {
+    name = "captive-browser";
+    desktopName = "Captive Browser";
+    exec = "${pkgs.captive-browser}/bin/captive-browser";
+    icon = "web-browser";
+    terminal = false;
+    categories = ["Application"];
+  };
+in {
   packages = with pkgs; [
     tor-browser # don't ask
 
@@ -21,6 +30,7 @@
     vital
 
     captive-browser # https://words.filippo.io/captive-browser
+    captiveBrowserDesktop
     inputs.glide-browser.packages."x86_64-linux".default
 
     (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;})