config cleanups

modules/nixos/network/default.nix

@@ -20,7 +20,7 @@ let
             autoconnect = profile.autoconnect;
             autoconnect-retries = profile.autoconnect-retries;
             autoconnect-priority = profile.priority;
-            interface-name = cfg.ipv4.interface;
+            interface-name = profile.interface or cfg.ipv4.interface;
           };
           ipv4 = {
             method = cfg.ipv4.method;
@@ -30,7 +30,7 @@ let
               { }
             else
               {
-                address = "${cfg.ipv4.address}\\24";
+                address = cfg.ipv4.address;
                 gateway = cfg.ipv4.gateway;
                 dns = cfg.ipv4.dns;
               }
@@ -42,6 +42,7 @@ let
           wifi = mkIf (profile.type == "wifi") {
             mode = "infrastructure";
             ssid = profile.ssid;
+            roaming = "allowed";
           };
           wifi-security = mkIf (profile.type == "wifi") {
             key-mgmt = profile.keyMgmt;
@@ -128,13 +129,18 @@ in
         trustedInterfaces = cfg.firewall.trustedInterfaces;
 
         # Default port ranges for KDE Connect
-        allowedTCPPortRanges = [
+        allowedTCPPortRanges = lib.mkIf cfg.firewall.kdeConnect.enable [
           {
-            from = 1714;
-            to = 1764;
+            from = cfg.firewall.kdeConnect.tcpRange.from;
+            to = cfg.firewall.kdeConnect.tcpRange.to;
+          }
+        ];
+        allowedUDPPortRanges = lib.mkIf cfg.firewall.kdeConnect.enable [
+          {
+            from = cfg.firewall.kdeConnect.udpRange.from;
+            to = cfg.firewall.kdeConnect.udpRange.to;
           }
         ];
-        allowedUDPPortRanges = config.networking.firewall.allowedTCPPortRanges;
 
         # Extra firewall commands
         extraCommands = lib.mkIf (cfg.extraFirewallCommands != "") cfg.extraFirewallCommands;
@@ -155,7 +161,7 @@ in
         # Use iwd as the WiFi backend when iwd is also enabled
         wifi.backend = mkIf cfg.iwd.enable "iwd";
         wifi.powersave = cfg.networkmanager.powersave;
-        settings.connectivity.uri = mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
+        settings.connectivity.uri = "http://nmcheck.gnome.org/check_network_status.txt";
         plugins = with pkgs; [
           networkmanager-fortisslvpn
           networkmanager-iodine