initial wireguard setup

5 files changed, 0 insertions, 61 deletions

diff --git a/modules/services/nixos/default.nix b/modules/services/nixos/default.nix
index db637e8..9c95180 100644
--- a/modules/services/nixos/default.nix
+++ b/modules/services/nixos/default.nix
@@ -4,7 +4,6 @@
     ./audio.nix
     ./bluetooth.nix
     ./tailscale.nix
-    ./wireguard
     ./selfhost
     ./ssh.nix
   ];
diff --git a/modules/services/nixos/networking/iwd.nix b/modules/services/nixos/networking/iwd.nix
index 910549c..fdd296a 100644
--- a/modules/services/nixos/networking/iwd.nix
+++ b/modules/services/nixos/networking/iwd.nix
@@ -23,5 +23,4 @@ in
       useDHCP = false;
       networkmanager.enable = false;
     };
-    systemd.network.enable = lib.mkForce false;
   }
diff --git a/modules/services/nixos/networking/networkmanager.nix b/modules/services/nixos/networking/networkmanager.nix
index 1bfe94e..e032bd0 100644
--- a/modules/services/nixos/networking/networkmanager.nix
+++ b/modules/services/nixos/networking/networkmanager.nix
@@ -14,10 +14,7 @@ in
       };
 
       dhcpcd.enable = false;
-      useNetworkd = false;
     };
 
-    systemd.network.enable = false;
-
     services.tailscale.extraSetFlags = lib.optional config.collinux.services.networking.tailscale.enable "--accept-dns=true";
   }
diff --git a/modules/services/nixos/wireguard/client.nix b/modules/services/nixos/wireguard/client.nix
deleted file mode 100644
index ec41ad5..0000000
--- a/modules/services/nixos/wireguard/client.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.services.networking.wireguard;
-in
-  lib.mkIf (cfg.enable && cfg.localPeer.role == "spoke") {
-    boot.extraModulePackages = [config.boot.kernelPackages.wireguard];
-
-    # we know the machine is configured to use networkd already
-    systemd.network = {
-      netdevs = {
-        "10-wg0" = {
-          netdevConfig = {
-            Kind = "wireguard";
-            Name = "wg0";
-          };
-
-          wireguardConfig = {
-            PrivateKeyFile = cfg.privateKeyFile;
-            ListenPort = 51820;
-          };
-
-          wireguardPeers = [
-            {
-              PublicKey = ""; # will configure later
-              AllowedIPs = ["100.100.0.1"];
-              Endpoint = "williamsfam.us.com:51820"; # not configured yet
-            }
-          ];
-        };
-      };
-
-      networks."12-wireguard" = {
-        name = "wg0";
-
-        networkConfig = {
-          Address = cfg.ip;
-          Gateway = "100.100.0.1";
-          DHCP = "no";
-
-          # disable ipv6 addresses
-          IPv6AcceptRA = "no";
-          IPv6PrivacyExtensions = "no";
-          LinkLocalAddressing = "no";
-        };
-      };
-    };
-  }
diff --git a/modules/services/nixos/wireguard/default.nix b/modules/services/nixos/wireguard/default.nix
deleted file mode 100644
index f7ecff0..0000000
--- a/modules/services/nixos/wireguard/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./client.nix
-    ./server.nix
-  ];
-}