allow for configuring dhcp via networkd

3 files changed, 54 insertions, 41 deletions

diff --git a/modules/services/nixos/networking/default.nix b/modules/services/nixos/networking/default.nix
index de573fe..076dc33 100644
--- a/modules/services/nixos/networking/default.nix
+++ b/modules/services/nixos/networking/default.nix
@@ -2,13 +2,16 @@
   imports = [
     ./iwd.nix
     ./networkmanager.nix
-    ./static.nix
+    ./networkd.nix
   ];
 
   # DNS
   services.resolved = {
     enable = true;
+    dnsovertls = "opportunistic";
     domains = [
+      "9.9.9.9#dns.quad9.net"
+      "149.112.112.112#dns.quad9.net"
       "1.1.1.1"
       "1.0.0.1"
     ];
diff --git a/modules/services/nixos/networking/networkd.nix b/modules/services/nixos/networking/networkd.nix
new file mode 100644
index 0000000..df14a08
--- /dev/null
+++ b/modules/services/nixos/networking/networkd.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.collinux.services.networking.networkd;
+
+  dhcp_enabled = cfg.static == null;
+in
+  lib.mkIf cfg.enable {
+    networking = {
+      wireless = {
+        enable = true;
+        networks.${cfg.ssid}.pskRaw = "ext:psk";
+        secretsFile = cfg.pskFile;
+      };
+
+      # Disable default networking stuff
+      dhcpcd.enable = false;
+      useDHCP = false;
+      networkmanager.enable = false;
+    };
+
+    systemd.network = {
+      enable = true;
+      networks."10-static-lan" = {
+        name = "wl*";
+
+        networkConfig =
+          (
+            if dhcp_enabled
+            then {
+              DHCP = "yes";
+            }
+            else {
+              Address = cfg.static.ip;
+              Gateway = cfg.static.gateway;
+              # DNS is managed by systemd-resolvd
+              DHCP = "no";
+            }
+          )
+          // {
+            # diable ipv6 addresses
+            IPv6AcceptRA = "no";
+            IPv6PrivacyExtensions = "no";
+            LinkLocalAddressing = "no";
+          };
+      };
+    };
+  }
diff --git a/modules/services/nixos/networking/static.nix b/modules/services/nixos/networking/static.nix
deleted file mode 100644
index 9338a6a..0000000
--- a/modules/services/nixos/networking/static.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.services.networking.static;
-in
-  lib.mkIf cfg.enable {
-    networking = {
-      wireless = {
-        enable = true;
-        networks.${cfg.ssid}.pskRaw = "ext:psk";
-        secretsFile = config.age.secrets.${cfg.pskFile}.path;
-      };
-
-      # Disable default networking stuff
-      dhcpcd.enable = false;
-      useDHCP = false;
-      networkmanager.enable = false;
-    };
-
-    systemd.network = {
-      enable = true;
-      networks."10-static-lan" = {
-        name = "wl*";
-
-        networkConfig = {
-          Address = "${cfg.ip}/24";
-          Gateway = cfg.gateway;
-          DNS = "1.1.1.1";
-          DHCP = "no";
-
-          # diable ipv6 addresses
-          IPv6AcceptRA = "no";
-          IPv6PrivacyExtensions = "no";
-          LinkLocalAddressing = "no";
-        };
-      };
-    };
-  }