4 files changed, 7 insertions, 5 deletions
diff --git a/modules/services/system/bluetooth.nix b/modules/services/system/bluetooth.nix
index a0c3f86..a86b5b3 100644
--- a/modules/services/system/bluetooth.nix
+++ b/modules/services/system/bluetooth.nix
@@ -12,5 +12,8 @@ in
       powerOnBoot = true;
     };
 
-    environment.systemPackages = [pkgs.blueman];
+    environment.systemPackages = [
+      (lib.mkIf cfg.blueman.enable pkgs.blueman)
+      (lib.mkIf cfg.bluetuith.enable pkgs.bluetuith)
+    ];
   }
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/nm.nix b/modules/services/system/networking/networkmanager.nix
index 674664e..f22f922 100644
--- a/modules/services/system/networking/nm.nix
+++ b/modules/services/system/networking/networkmanager.nix
@@ -5,7 +5,7 @@
 }: let
   cfg = config.collinux.services.networking;
 in
-  lib.mkIf (cfg.enable && cfg.wifiDaemon == "networkmanager") {
+  lib.mkIf (cfg.enable && cfg.networkmanager.enable) {
     networking = {
       nameservers = ["1.1.1.1" "1.0.0.1"];
       enableIPv6 = false;