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, 28 insertions, 27 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;
       };
     };
   };