Catch all the stuff I missed in the server services to get them to build

hosts/cyberspark/home/default.nix

@@ -1,14 +1,18 @@
 { ... }:
 {
   imports = [
+    # Programs and apps
     ../../../modules/home
     ../../../modules/home/users
-    ../../../modules/home/programs/fastfetch
-    ../../../modules/home/programs/git
-    ../../../modules/home/programs/ncmpcpp
-    ../../../modules/home/programs/neovim
-    ../../../modules/home/programs/ranger
-    ../../../modules/home/programs/tmux
+    ../../../modules/home/programs/terminal/fastfetch
+    ../../../modules/home/programs/terminal/git
+    ../../../modules/home/programs/terminal/neovim
+    ../../../modules/home/programs/terminal/ranger
+    ../../../modules/home/programs/terminal/tmux
     ../../../modules/home/utils/zsh
+
+    # Misc
+    ../../../overlays
+    ../../../variables
   ];
 }

hosts/cyberspark/system/default.nix

@@ -3,10 +3,10 @@
   imports = [
     ./hardware
 
-    mailserver.nixosModule
     ../../../modules/system
     ../../../modules/system/accounts
     ../../../modules/system/devices/filesystems
+    ../../../modules/system/devices/boot/systemd
     ../../../modules/system/devices/networking
     ../../../modules/system/devices/networking/firewall/server
     ../../../modules/system/devices/networking/wireguard/server
@@ -14,6 +14,11 @@
     ../../../modules/system/programs/security
     ../../../modules/system/services/common
     ../../../modules/system/services/server
+
+    ../../../overlays
+    ../../../variables
+
+    mailserver.nixosModule
   ];
 
   networking.hostName = "cyberspark";

hosts/cyberspark/system/hardware/default.nix

@@ -1,4 +1,4 @@
-{ config, outputs, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
@@ -25,7 +25,7 @@
     swraid = {
       enable = true;
       mdadmConf = ''
-        MAILADDR jimbo@${outputs.secrets.jimDomain}
+        MAILADDR jimbo@jimbosfiles.com
       '';
     };
   };