From 55d12269daddc3648eae5d236756059191834431 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Mon, 19 Jan 2026 07:44:46 -0600
Subject: initial wireguard setup

---
 hosts/ganymede/config.nix | 38 +++++++++++++++++---------------------
 hosts/ganymede/nixos.nix  |  1 -
 hosts/mercury/config.nix  | 11 +++++------
 3 files changed, 22 insertions(+), 28 deletions(-)

(limited to 'hosts')

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index f6b3b74..a7a68ea 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -1,6 +1,4 @@
-{config, ...}: let
-  tailscaleIP = "100.100.218.182";
-in {
+{config, ...}: {
   collinux = {
     user.name = "collin";
 
@@ -21,18 +19,16 @@ in {
       ip = "100.100.0.1";
       gateway = "100.100.0.1";
       privateKeyFile = config.collinux.secrets."wg-key".path;
-      peers = [
-        {
-          # mercury
+      peers = {
+        "mercury" = {
           publicKey = "EDDppGqbLfEwEcHLP3J+bxKVGW16fAcU83K/ZKR2h3A=";
           ip = "100.100.0.5/32";
-        }
-        {
-          # jupiter
+        };
+        "jupiter" = {
           publicKey = "Pi1PydaaEz9IcAZ+elH5HkzEa2D35P/tUy+9KKH6PHI=";
           ip = "100.100.0.10/32";
-        }
-      ];
+        };
+      };
     };
 
     terminal = {
@@ -59,10 +55,10 @@ in {
             gateway = "192.168.50.1";
           };
         };
-        tailscale = {
-          enable = true;
-          tailnet = "collinux.tailnet";
-        };
+        # tailscale = {
+        #   enable = true;
+        #   tailnet = "collinux.tailnet";
+        # };
         sshd = {
           enable = true;
           bind_host = "0.0.0.0";
@@ -77,15 +73,15 @@ in {
 
         forgejo = {
           enable = true;
-          bind_host = tailscaleIP;
+          bind_host = "127.0.0.1";
           root_url = "ganymede.collinux.tailnet:8010";
         };
 
-        headscale = {
-          enable = true;
-          root_url = "headscale.williamsfam.us.com";
-          caddy.enable = true;
-        };
+        # headscale = {
+        #   enable = true;
+        #   root_url = "headscale.williamsfam.us.com";
+        #   caddy.enable = true;
+        # };
       };
     };
   };
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index 9dc6dec..6680967 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -5,7 +5,6 @@
 }: {
   imports = [
     inputs.disko.nixosModules.disko
-    inputs.tsnsrv.nixosModules.default
     ./disks.nix
 
     ./minecraft.nix
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index f996be9..712c1aa 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -12,14 +12,13 @@
       ip = "100.100.0.5";
       gateway = "100.100.0.1";
       privateKeyFile = config.collinux.secrets."wg-key".path;
-      peers = [
-        {
-          # ganymede
+      peers = {
+        "ganymede" = {
           publicKey = "WNLf8M6JGSHeRVvbAF6E/6oxAHeNxv6bXqqlmwMdvlk=";
           ip = "100.100.0.0/24";
           endpoint = "williamsfam.us.com:51820";
-        }
-      ];
+        };
+      };
     };
 
     desktop = {
@@ -52,7 +51,7 @@
       networking = {
         enable = true;
         iwd.enable = true;
-        tailscale.enable = true;
+        # tailscale.enable = true;
       };
       bluetooth = {
         enable = true;
-- 
cgit v1.3.1