Merged Host/Home Opt into SysOpt

systems/avalon/cfg.nix

@@ -0,0 +1,42 @@
+{
+  syscfg = {
+    hostname = "avalon";
+    defaultUser = "sora";
+    users = [
+      {
+        username = "sora";
+        git = {
+          email = "soraefir+git@helcel";
+          username = "soraefir";
+          key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
+        };
+      }
+      {
+        username = "git";
+        git = {
+          email = "git+git@helcel";
+          username = "git";
+          key = "";
+        };
+      }
+    ];
+    make = {
+      gui = false;
+      cli = true;
+      virt = true;
+      power = false;
+      game = false;
+      develop = false;
+    };
+    wlp = {
+      enable = false;
+      nif = "";
+    };
+    wg = {
+      enable = true;
+      ip4 = "10.10.1.2/32";
+      ip6 = "fd10:10:10::2/128";
+      pk = config.sops.secrets.avalon_wg_priv.path;
+    };
+  };
+}

systems/avalon/default.nix

@@ -1,32 +1,9 @@
 { config, inputs, ... }: {
-  imports = with inputs.hardware.nixosModules; [
-    ./hardware-configuration.nix
-    common-cpu-intel
-    common-gpu-intel
-  ];
-
-  hostcfg = {
-    hostname = "avalon";
-    username = "sora";
-    make = {
-      gui = false;
-      cli = true;
-      virt = true;
-      power = false;
-      game = false;
-    };
-    net = {
-      wlp = {
-        enable = false;
-        nif = "";
-      };
-      wg = {
-        enable = true;
-        ip4 = "10.10.1.2/32";
-        ip6 = "fd10:10:10::2/128";
-        pk = config.sops.secrets.avalon_wg_priv.path;
-      };
-    };
-  };
+  imports = with inputs.hardware.nixosModules;
+    [
+      ./hardware.nix
+      # common-cpu-intel
+      # common-gpu-intel
+    ];
 }
 

systems/avalon/home.nix

@@ -1,15 +0,0 @@
-{ ... }: {
-  config.homecfg = {
-    username = "sora";
-    make = {
-      gui = false;
-      cli = true;
-      game = false;
-    };
-    git = {
-      email = "soraefir+git@pm.me";
-      username = "soraefir";
-      key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
-    };
-  };
-}