Alright this ain't finished cause of the home stuff but I don't wanna lose what I've done. Impermanence, disko, lots of changes. TODO: add modularity to home.

modules/system/devices/networking/default.nix

@@ -4,5 +4,9 @@
     wireless.enable = false;
     dhcpcd.enable = true;
     nftables.enable = true;
+    nameservers = [
+      "1.1.1.1"
+      "1.1.1.2"
+    ];
   };
 }

modules/system/devices/networking/wireguard/pc/default.nix

@@ -1,22 +1,22 @@
 { config, ... }:
 {
-  networking.firewall = {
-    allowedUDPPorts = [ 51820 ];
-  };
+  networking = {
+    firewall.allowedUDPPorts = [ 51820 ];
 
-  networking.wireguard.interfaces = {
-    "${config.ips.wgInt}" = {
-      # Define IP of client in per device config
-      listenPort = 51820;
-      privateKey = config.secrets.wgClientPriv;
-      peers = [
-        {
-          publicKey = "qnOT/lXOJMaQgDUdXpyfGZB2IEyUouRje2m/bCe9ux8=";
-          allowedIPs = [ "${config.ips.wgSpan}.0/24" ];
-          endpoint = "sv.${config.domains.jim1}:51820";
-          persistentKeepalive = 25;
-        }
-      ];
+    wireguard.interfaces = {
+      "${config.ips.wgInt}" = {
+        # Define IP of client in per device config
+        listenPort = 51820;
+        privateKey = config.secrets.wgClientPriv;
+        peers = [
+          { # NixOS Server
+            publicKey = "qnOT/lXOJMaQgDUdXpyfGZB2IEyUouRje2m/bCe9ux8=";
+            allowedIPs = [ "${config.ips.wgSpan}.0/24" ];
+            endpoint = "sv.${config.domains.jim1}:51820";
+            persistentKeepalive = 25;
+          }
+        ];
+      };
     };
   };
 }

modules/system/devices/networking/wireguard/server/default.nix

@@ -6,12 +6,10 @@
       externalInterface = "${config.ips.netInt}";
       internalInterfaces = [ "${config.ips.wgInt}" ];
     };
-    firewall.allowedUDPPorts = [ 51820 ];
-  };
 
-  networking.wireguard = {
-    enable = true;
-    interfaces = {
+    firewall.allowedUDPPorts = [ 51820 ];
+
+    wireguard.interfaces = {
       "${config.ips.wgInt}" = {
         ips = [ "${config.ips.wgSpan}.1/24" ];
         listenPort = 51820;

modules/system/devices/networking/wireless/default.nix

@@ -5,7 +5,5 @@
     enableB43Firmware = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    unstable.impala
-  ];
+  environment.systemPackages = with pkgs; [ unstable.impala ];
 }