clean up networking and selfhosted apps configuration

3 files changed, 7 insertions, 3 deletions

diff --git a/modules/services/nixos/networking/default.nix b/modules/services/nixos/networking/default.nix
index ea4e4af..2667849 100644
--- a/modules/services/nixos/networking/default.nix
+++ b/modules/services/nixos/networking/default.nix
@@ -5,6 +5,8 @@
     ./networkd.nix
   ];
 
+  networking.firewall.enable = true;
+
   # DNS
   services.resolved = {
     enable = true;
diff --git a/modules/services/nixos/networking/networkd.nix b/modules/services/nixos/networking/networkd.nix
index df14a08..9a11129 100644
--- a/modules/services/nixos/networking/networkd.nix
+++ b/modules/services/nixos/networking/networkd.nix
@@ -15,6 +15,8 @@ in
         secretsFile = cfg.pskFile;
       };
 
+      useNetworkd = true;
+
       # Disable default networking stuff
       dhcpcd.enable = false;
       useDHCP = false;
@@ -23,7 +25,7 @@ in
 
     systemd.network = {
       enable = true;
-      networks."10-static-lan" = {
+      networks."11-static-lan" = {
         name = "wl*";
 
         networkConfig =
@@ -35,7 +37,7 @@ in
             else {
               Address = cfg.static.ip;
               Gateway = cfg.static.gateway;
-              # DNS is managed by systemd-resolvd
+              # DNS is managed by systemd-resolvd (not specified here)
               DHCP = "no";
             }
           )
diff --git a/modules/services/nixos/networking/networkmanager.nix b/modules/services/nixos/networking/networkmanager.nix
index 46edf96..1bfe94e 100644
--- a/modules/services/nixos/networking/networkmanager.nix
+++ b/modules/services/nixos/networking/networkmanager.nix
@@ -8,9 +8,9 @@ in
   lib.mkIf cfg.enable {
     networking = {
       networkmanager = {
+        enable = true;
         dns = "systemd-resolved";
         dhcp = "internal";
-        enable = true;
       };
 
       dhcpcd.enable = false;