Merged Host/Home Opt into SysOpt

systems/ci/cfg.nix

@@ -0,0 +1,33 @@
+{
+  syscfg = {
+    hostname = "ci";
+    defaultUser = "ci";
+    users = [{
+      username = "ci";
+      git = {
+        email = "ci@ci";
+        username = "CI";
+        key = "";
+      };
+    }];
+    make = {
+      gui = true;
+      cli = true;
+      virt = true;
+      power = true;
+      game = true;
+      develop = true;
+    };
+    net = {
+      wlp = {
+        enable = false;
+        nif = "NA";
+      };
+      wg = {
+        enable = false;
+        ip4 = "";
+        ip6 = "";
+      };
+    };
+  };
+}

systems/ci/default.nix

@@ -1,29 +1,2 @@
-{ config, inputs, ... }: {
-  imports = [ ./hardware.nix ];
-
-  hostcfg = {
-    hostname = "valinor";
-    username = "sora";
-    make = {
-      gui = true;
-      cli = true;
-      virt = true;
-      power = true;
-      game = true;
-      develop = true;
-    };
-    net = {
-      wlp = {
-        enable = false;
-        nif = "NA";
-      };
-      wg = {
-        enable = false;
-        ip4 = "";
-        ip6 = "";
-        pk = "";
-      };
-    };
-  };
-}
+{ config, inputs, ... }: { imports = [ ./hardware.nix ]; }
 

systems/ci/hardware.nix

@@ -16,6 +16,5 @@
   };
 
   networking.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

systems/ci/home.nix

@@ -1,18 +0,0 @@
-{ config, ... }: {
-
-  config.homecfg = {
-    username = "sora";
-    make = {
-      gui = true;
-      cli = true;
-      game = true;
-      develop = true;
-      power = true;
-    };
-    git = {
-      email = "ci@nonet";
-      username = "CI";
-      key = "";
-    };
-  };
-}