From 8fa6ed6444a3df3647bed8396b42936bdf76ab39 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Mon, 21 Sep 2026 15:28:08 -0500
Subject: new machines! random other changes

---
 hosts/mercury/nixos.nix     | 22 +++++++++++++++++-----
 hosts/mercury/wireguard.nix |  1 -
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 87c0495..ff386cd 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -1,6 +1,7 @@
 {
   inputs,
   hosts,
+  lib,
   ...
 }: {
   imports = [
@@ -17,11 +18,22 @@
 
   services.upower.enable = true;
 
-  programs.ssh.extraConfig = ''
-    Host ganymede
-      HostName 10.100.0.1
-      Port 22
-  '';
+  programs.ssh.extraConfig =
+    hosts
+    |> (lib.mapAttrsToList (hostname: hostAttrs:
+      if hostAttrs ? ip
+      then ''
+        Host ${hostname}
+          ${
+          if hostAttrs ? jump
+          then "ProxyJump ${hostAttrs.jump}"
+          else ""
+        }
+          HostName ${hostAttrs.ip}
+      ''
+      else ""))
+    |> (builtins.filter (s: s != ""))
+    |> (lib.concatStringsSep "\n");
 
   programs.kdeconnect.enable = true;
 
diff --git a/hosts/mercury/wireguard.nix b/hosts/mercury/wireguard.nix
index a103328..f8b1bd8 100644
--- a/hosts/mercury/wireguard.nix
+++ b/hosts/mercury/wireguard.nix
@@ -42,7 +42,6 @@ in {
     wants = ["network-online.target"];
     script = ''
       REMOTE_IP=$(${pkgs.dnsutils}/bin/dig +short williamsfam.us.com | ${pkgs.gawk}/bin/awk 'NR==1')
-
       if [[ -z "$REMOTE_IP" ]]; then
         echo "Failed to resolve DNS for configured domain" >&2
         exit 1
-- 
cgit v1.3.1