Merged Host/Home Opt into SysOpt

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