From 82ec91b4d2c253c6ccb783f960a2788f230d6ad1 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Tue, 8 Jul 2025 17:03:20 +0000
Subject: start avoiding lib.enum; start using hjem generators

---
 modules/services/system/networking/default.nix        |  3 +--
 modules/services/system/networking/iwd.nix            |  2 +-
 modules/services/system/networking/networkmanager.nix | 15 +++++++++++++++
 modules/services/system/networking/nm.nix             | 15 ---------------
 4 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 modules/services/system/networking/networkmanager.nix
 delete mode 100644 modules/services/system/networking/nm.nix

(limited to 'modules/services/system/networking')

diff --git a/modules/services/system/networking/default.nix b/modules/services/system/networking/default.nix
index 4908b6f..68c794c 100644
--- a/modules/services/system/networking/default.nix
+++ b/modules/services/system/networking/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./iwd.nix
-    ./nm.nix
+    ./networkmanager.nix
   ];
 
   config = {
@@ -16,4 +16,3 @@
     networking.resolvconf.enable = false;
   };
 }
-
diff --git a/modules/services/system/networking/iwd.nix b/modules/services/system/networking/iwd.nix
index 5306f29..d081792 100644
--- a/modules/services/system/networking/iwd.nix
+++ b/modules/services/system/networking/iwd.nix
@@ -5,7 +5,7 @@
 }: let
   cfg = config.collinux.services.networking;
 in
-  lib.mkIf (cfg.enable && cfg.wifiDaemon == "iwd") {
+  lib.mkIf (cfg.enable && cfg.iwd.enable) {
     networking = {
       wireless.iwd = {
         enable = true;
diff --git a/modules/services/system/networking/networkmanager.nix b/modules/services/system/networking/networkmanager.nix
new file mode 100644
index 0000000..f22f922
--- /dev/null
+++ b/modules/services/system/networking/networkmanager.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.collinux.services.networking;
+in
+  lib.mkIf (cfg.enable && cfg.networkmanager.enable) {
+    networking = {
+      nameservers = ["1.1.1.1" "1.0.0.1"];
+      enableIPv6 = false;
+
+      networkmanager.enable = true;
+    };
+  }
diff --git a/modules/services/system/networking/nm.nix b/modules/services/system/networking/nm.nix
deleted file mode 100644
index 674664e..0000000
--- a/modules/services/system/networking/nm.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.services.networking;
-in
-  lib.mkIf (cfg.enable && cfg.wifiDaemon == "networkmanager") {
-    networking = {
-      nameservers = ["1.1.1.1" "1.0.0.1"];
-      enableIPv6 = false;
-
-      networkmanager.enable = true;
-    };
-  }
-- 
cgit v1.3.1