clean up networking config and support for usb teather

2 files changed, 12 insertions, 13 deletions

diff --git a/modules/services/nixos/networking/default.nix b/modules/services/nixos/networking/default.nix
index 42cab1e..de573fe 100644
--- a/modules/services/nixos/networking/default.nix
+++ b/modules/services/nixos/networking/default.nix
@@ -5,16 +5,15 @@
     ./static.nix
   ];
 
-  config = {
-    services.resolved = {
-      enable = true;
-      domains = [
-        "1.1.1.1"
-        "1.0.0.1"
-      ];
-    };
-    networking.resolvconf.enable = false;
-
-    systemd.network.wait-online.enable = false;
+  # DNS
+  services.resolved = {
+    enable = true;
+    domains = [
+      "1.1.1.1"
+      "1.0.0.1"
+    ];
   };
+  networking.resolvconf.enable = false;
+
+  systemd.network.wait-online.enable = false;
 }
diff --git a/modules/services/nixos/networking/iwd.nix b/modules/services/nixos/networking/iwd.nix
index 441498d..910549c 100644
--- a/modules/services/nixos/networking/iwd.nix
+++ b/modules/services/nixos/networking/iwd.nix
@@ -3,9 +3,9 @@
   config,
   ...
 }: let
-  cfg = config.collinux.services.networking;
+  cfg = config.collinux.services.networking.iwd;
 in
-  lib.mkIf (cfg.enable && cfg.iwd.enable) {
+  lib.mkIf cfg.enable {
     networking = {
       wireless.iwd = {
         enable = true;