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";
-    };
-  };
-}

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 = "";
-    };
-  };
-}

systems/iriy/cfg.nix

@@ -0,0 +1,33 @@
+{
+  syscfg = {
+    hostname = "iriy";
+    defaultUser = "sora";
+    users = [{
+      username = "sora";
+      git = {
+        email = "soraefir+git@helcel";
+        username = "soraefir";
+        key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
+      };
+    }];
+    make = {
+      gui = true;
+      cli = true;
+      virt = true;
+      power = false;
+      game = true;
+      develop = true;
+    };
+    net = {
+      wlp = {
+        enable = true;
+        nif = "wlp11s0";
+      };
+      wg = {
+        enable = true;
+        ip4 = "10.10.1.7/32";
+        ip6 = "fd10:10:10::7/128";
+      };
+    };
+  };
+}

systems/iriy/default.nix

@@ -1,33 +1,8 @@
 { config, inputs, ... }: {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     # inputs.hardware.common-cpu-amd
     # inputs.hardware.common-gpu-amd
   ];
-
-  hostcfg = {
-    hostname = "iriy";
-    username = "sora";
-    make = {
-      gui = true;
-      cli = true;
-      virt = true;
-      power = false;
-      game = true;
-      develop = true;
-    };
-    net = {
-      wlp = {
-        enable = true;
-        nif = "wlp11s0";
-      };
-      wg = {
-        enable = true;
-        ip4 = "10.10.1.7/32";
-        ip6 = "fd10:10:10::7/128";
-        pk = config.sops.secrets.iriy_wg_priv.path;
-      };
-    };
-  };
 }
 

systems/iriy/hardware.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
+{ config, lib, pkgs, modulesPath, ... }: {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules =

systems/iriy/home.nix

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

systems/valinor/cfg.nix

@@ -0,0 +1,33 @@
+{
+  syscfg = {
+    hostname = "valinor";
+    defaultUser = "sora";
+    users = [{
+      username = "sora";
+      git = {
+        email = "soraefir+git@helcel";
+        username = "soraefir";
+        key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
+      };
+    }];
+    make = {
+      gui = true;
+      cli = true;
+      virt = true;
+      power = true;
+      game = true;
+      develop = true;
+    };
+    net = {
+      wlp = {
+        enable = true;
+        nif = "wlp3s0";
+      };
+      wg = {
+        enable = true;
+        ip4 = "10.10.1.5/32";
+        ip6 = "fd10:10:10::5/128";
+      };
+    };
+  };
+}

systems/valinor/default.nix

@@ -1,33 +1,8 @@
 { config, inputs, ... }: {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     #common-cpu-amd
     #common-gpu-amd
   ];
-
-  hostcfg = {
-    hostname = "valinor";
-    username = "sora";
-    make = {
-      gui = true;
-      cli = true;
-      virt = true;
-      power = true;
-      game = true;
-      develop = true;
-    };
-    net = {
-      wlp = {
-        enable = true;
-        nif = "wlp3s0";
-      };
-      wg = {
-        enable = true;
-        ip4 = "10.10.1.5/32";
-        ip6 = "fd10:10:10::5/128";
-        pk = config.sops.secrets.valinor_wg_priv.path;
-      };
-    };
-  };
 }
 

systems/valinor/hardware.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
+{ config, lib, pkgs, modulesPath, ... }: {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules =

systems/valinor/home.nix

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