nuke wireguard config

5 files changed, 1 insertions, 48 deletions

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index 7b8fbea..4a412b4 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -16,23 +16,6 @@
       };
     };
 
-    wireguard = {
-      enable = true;
-      ip = "100.100.0.1";
-      gateway = "100.100.0.1";
-      privateKeyFile = config.collinux.secrets."wg-key".path;
-      peers = {
-        "mercury" = {
-          publicKey = "dU9CI6OQr0nJXb2JCy3SgqcraK60zuQzFJu3iHG6AAU=";
-          ip = "100.100.0.5/32";
-        };
-        "jupiter" = {
-          publicKey = "Pi1PydaaEz9IcAZ+elH5HkzEa2D35P/tUy+9KKH6PHI=";
-          ip = "100.100.0.10/32";
-        };
-      };
-    };
-
     terminal = {
       programs = {
         git = {
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index 47e3129..75fe039 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -1,7 +1,6 @@
 {
   config,
   inputs,
-  lib,
   ...
 }: {
   imports = [
@@ -24,10 +23,6 @@
     networkConfig.DHCP = "yes";
   };
 
-  systemd.networks."12-wireguard" = {
-    networkConfig.Address = lib.mkForce ["100.100.0.1/24"];
-  };
-
   # i broke something and this fixes it
   environment.etc."systemd/resolved.conf.d/10-dns.conf".text = config.environment.etc."systemd/resolved.conf".text;
 }
diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index 806785e..decaa61 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -1,28 +1,9 @@
-{config, ...}: {
+{
   collinux = {
     theme = "adwaita";
 
     user.name = "collin";
 
-    secrets = {
-      "wg-key".file = ./jupiter-wg-key.age;
-    };
-
-    wireguard = {
-      enable = true;
-      ip = "100.100.0.10";
-      gateway = "100.100.0.1";
-      privateKeyFile = config.collinux.secrets."wg-key".path;
-      peers = [
-        {
-          # ganymede
-          publicKey = "WNLf8M6JGSHeRVvbAF6E/6oxAHeNxv6bXqqlmwMdvlk=";
-          ip = "100.100.0.0/24";
-          endpoint = "williamsfam.us.com:51820";
-        }
-      ];
-    };
-
     desktop = {
       gnome.enable = true;
       gdm.enable = true;
diff --git a/hosts/jupiter/hjem.nix b/hosts/jupiter/hjem.nix
index 3ab44d4..67af264 100644
--- a/hosts/jupiter/hjem.nix
+++ b/hosts/jupiter/hjem.nix
@@ -6,6 +6,5 @@
 
     vital
     musescore
-    qpwgraph
   ];
 }
diff --git a/secrets.nix b/secrets.nix
index d95f27a..d0a5ffb 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -8,9 +8,4 @@ in {
   "tsnsrv-authkey.age".publicKeys = [ganymede mercury];
   "williams-psk.age".publicKeys = [ganymede];
   "github-ssh-key.age".publicKeys = [mercury jupiter];
-
-  # wireguard keys
-  "mercury-wg-key.age".publicKeys = [mercury];
-  "jupiter-wg-key.age".publicKeys = [jupiter];
-  "ganymede-wg-key.age".publicKeys = [ganymede];
 }