organized better

info.default.nix

@@ -3,8 +3,10 @@
   username = "biscuit";
   timezone = "America/Chicago";
 
-  vpnEnable = true;
-  vpnSecretFile = "/home/biscuit/Wireguard/secret";
+  vpn = {
+    vpnEnable = true;
+    vpnSecretFile = "/home/biscuit/Wireguard/secret";
+  };
 
   allowUnfree = true;
   touchpadSupport = false;

modules/system.nix

@@ -1,5 +1,5 @@
 {
-  vpnEnable,
+  vpn,
   lib,
   ...
 }: {
@@ -8,7 +8,7 @@
       ../system/default.nix
       ../system/users.nix
     ]
-    ++ lib.optionals (vpnEnable == true) [
+    ++ lib.optionals (vpn.vpnEnable == true) [
       ../system/vpn.nix
     ];
 }

system/vpn.nix

@@ -1,5 +1,5 @@
 {
-  vpnSecretFile,
+  vpn,
   username,
   ...
 }: {
@@ -8,7 +8,7 @@
       address = ["10.2.0.2/32"];
       # listenPort = 51820;
       # FIXME change privateKey to variable and add env (make sure it is inaccessible!)
-      privateKeyFile = vpnSecretFile;
+      privateKeyFile = vpn.vpnSecretFile;
       dns = ["10.2.0.1"];
       peers = [
         {