From be5794634726ca6b6f91f7d21e598d8f21692524 Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Tue, 20 May 2025 21:47:13 -0500
Subject: [PATCH] upd

---
 info.nix           |  1 +
 modules/system.nix | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/info.nix b/info.nix
index b6f8385..1c9ef3f 100644
--- a/info.nix
+++ b/info.nix
@@ -3,5 +3,6 @@
   username = "biscuit";
   timezone = "America/Chicago";
 
+  # VPN
   vpn_enable = true;
 }
diff --git a/modules/system.nix b/modules/system.nix
index 3fc86b4..438a83f 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -1,18 +1,25 @@
-{vpn_enable, ...}: {
-  imports = [
-    ../system/bootloader.nix
-    ../system/firewall.nix
-    ../system/locale.nix
-    ../system/network.nix
-    ../system/term.nix
-    ../system/development.nix
-    # ../system/proxy.nix
-    # ../system/recovery.nix # only supports non-flake conf
-    ../system/ssh.nix
-    ../system/timezone.nix
-    # ../system/touchpad.nix
-    ../system/users.nix
-    ../system/tools.nix
-    (if vpn_enable then ../system/vpn.nix else null)
-  ];
+{
+  vpn_enable,
+  lib,
+  ...
+}: {
+  imports =
+    [
+      ../system/bootloader.nix
+      ../system/firewall.nix
+      ../system/locale.nix
+      ../system/network.nix
+      ../system/term.nix
+      ../system/development.nix
+      # ../system/proxy.nix
+      # ../system/recovery.nix # only supports non-flake conf
+      ../system/ssh.nix
+      ../system/timezone.nix
+      # ../system/touchpad.nix
+      ../system/users.nix
+      ../system/tools.nix
+    ]
+    ++ lib.optionals (vpn_enable == true) [
+      ../system/vpn.nix
+    ];
 }