various changes to networking stack

3 files changed, 21 insertions, 18 deletions

diff --git a/modules/services/nixos/networking/iwd.nix b/modules/services/nixos/networking/iwd.nix
index fdd296a..db5cc2e 100644
--- a/modules/services/nixos/networking/iwd.nix
+++ b/modules/services/nixos/networking/iwd.nix
@@ -11,8 +11,9 @@ in
         enable = true;
         settings = {
           General = {
-            EnableNetworkConfiguration = true; # use builtin dhcp client
+            EnableNetworkConfiguration = !config.collinux.services.networking.networkd.enable;
             AddressRandomization = "once";
+            AddressRandomizationRange = "full";
           };
           Network.NameResolvingService = "systemd"; # either systemd or resolvconf
         };
diff --git a/modules/services/nixos/networking/networkd.nix b/modules/services/nixos/networking/networkd.nix
index 920b93f..e84fd2f 100644
--- a/modules/services/nixos/networking/networkd.nix
+++ b/modules/services/nixos/networking/networkd.nix
@@ -9,11 +9,14 @@
 in
   lib.mkIf cfg.enable {
     networking = {
-      wireless = {
-        enable = true;
-        networks.${cfg.ssid}.pskRaw = "ext:psk";
-        secretsFile = cfg.pskFile;
-      };
+      wireless =
+        if !config.collinux.services.networking.iwd.enable
+        then {
+          enable = true;
+          networks.${cfg.ssid}.pskRaw = "ext:psk";
+          secretsFile = cfg.pskFile;
+        }
+        else {};
 
       useNetworkd = true;
 
@@ -32,28 +35,26 @@ in
         anyInterface = true;
       };
 
-      networks."11-static-lan" = {
+      networks."11-lan" = {
         name = "wl*";
 
         networkConfig =
           (
             if dhcp_enabled
-            then {
-              DHCP = "yes";
-            }
+            then {DHCP = "yes";}
             else {
               Address = cfg.static.ip;
               Gateway = cfg.static.gateway;
-              # DNS is managed by systemd-resolvd (not specified here)
               DHCP = "no";
+              # DNS is managed by systemd-resolved (not specified here)
             }
           )
           // {
-            # diable ipv6 addresses
-            IPv6AcceptRA = "no";
-            IPv6PrivacyExtensions = "no";
             LinkLocalAddressing = "no";
           };
+
+        dhcpV4Config.UseDNS = "no";
+        dhcpV6Config.UseDNS = "no";
       };
     };
   }
diff --git a/modules/services/nixos/networking/resolved.nix b/modules/services/nixos/networking/resolved.nix
index b552095..03333b1 100644
--- a/modules/services/nixos/networking/resolved.nix
+++ b/modules/services/nixos/networking/resolved.nix
@@ -1,14 +1,15 @@
 {
   networking.resolvconf.enable = false;
 
+  networking.nameservers = [
+    "9.9.9.9#dns.quad9.net"
+    "149.112.112.112#dns.quad9.net"
+  ];
+
   services.resolved = {
     enable = true;
     dnsovertls = "opportunistic";
     dnssec = "allow-downgrade";
-    fallbackDns = [
-      "9.9.9.9#dns.quad9.net"
-      "149.112.112.112#dns.quad9.net"
-    ];
 
     # disable extra stuff
     llmnr = "false";