From d2aecd69c17fa64305c07333686576152432993d Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Wed, 15 Jul 2026 12:03:58 -0500 Subject: changes. --- hosts/ganymede/caddy.nix | 15 +++++- hosts/ganymede/config.nix | 9 ++++ hosts/ganymede/iwlwifi.nix | 23 --------- hosts/ganymede/nixos.nix | 14 +----- .../ganymede/secrets/collin-copyparty-password.age | 7 --- hosts/ganymede/secrets/collin-forgejo-password.age | 7 --- hosts/ganymede/secrets/copilot-token.age | 11 ----- hosts/ganymede/secrets/ganymede-wg-key.age | 5 -- hosts/ganymede/secrets/tsnsrv-authkey.age | 7 --- hosts/ganymede/secrets/wg-privkey.age | 12 +++++ hosts/ganymede/secrets/wireguard-privkey.age | 8 --- hosts/ganymede/wireguard.nix | 57 ++++++++++++++++++++++ 12 files changed, 93 insertions(+), 82 deletions(-) delete mode 100644 hosts/ganymede/iwlwifi.nix delete mode 100644 hosts/ganymede/secrets/collin-copyparty-password.age delete mode 100644 hosts/ganymede/secrets/collin-forgejo-password.age delete mode 100644 hosts/ganymede/secrets/copilot-token.age delete mode 100644 hosts/ganymede/secrets/ganymede-wg-key.age delete mode 100644 hosts/ganymede/secrets/tsnsrv-authkey.age create mode 100644 hosts/ganymede/secrets/wg-privkey.age delete mode 100644 hosts/ganymede/secrets/wireguard-privkey.age create mode 100644 hosts/ganymede/wireguard.nix (limited to 'hosts/ganymede') diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix index a03fcdc..3a805f4 100644 --- a/hosts/ganymede/caddy.nix +++ b/hosts/ganymede/caddy.nix @@ -19,8 +19,21 @@ } ''; + virtualHosts."lindsey.williamsfam.us.com".extraConfig = '' + redir https://williams-ryan-lindsey.blogspot.com permanent + ''; + + virtualHosts."daniel.williamsfam.us.com".extraConfig = '' + root * /media/public/www/daniel + file_server + ''; + + # virtualHosts."collin.williamsfam.us.com".extraConfig = '' + # root * /med + # ''; + virtualHosts."williamsfam.us.com".extraConfig = '' - root * /media/public/www + root * /media/public/www/root file_server ''; }; diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index 8150e14..0858106 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -9,6 +9,11 @@ }; "caddy-env".file = ./secrets/caddy-env.age; + + "wireguard-privkey" = { + file = ./secrets/wg-privkey.age; + owner = "systemd-network"; + }; }; terminal = { @@ -84,6 +89,10 @@ enable = true; privateUrl = "git.ganymede"; }; + glance = { + enable = true; + port = 8081; + }; caddy = { enable = true; diff --git a/hosts/ganymede/iwlwifi.nix b/hosts/ganymede/iwlwifi.nix deleted file mode 100644 index 729034f..0000000 --- a/hosts/ganymede/iwlwifi.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - # Append Kernel modules - boot.kernelModules = [ - "brcmfmac" - "brcmutil" - "iwlmvm" - "iwlwifi" - "mmc_core" - "mt76_usb" - "mt76" - "mt76x0_common" - "mt76x02_lib" - "mt76x02_usb" - "mt76x0u" - "r8188eu" - "rtl_usb" - "rtl8192c_common" - "rtl8192cu" - "rtlwifi" - ]; - hardware.enableAllFirmware = true; - hardware.enableRedistributableFirmware = true; -} diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix index 77e3ad5..d913df7 100644 --- a/hosts/ganymede/nixos.nix +++ b/hosts/ganymede/nixos.nix @@ -9,24 +9,12 @@ inputs.disko.nixosModules.disko inputs.nixos-facter-modules.nixosModules.facter ./disks.nix - - ./iwlwifi.nix ./caddy.nix + ./wireguard.nix ]; facter.reportPath = ./facter.json; - environment.systemPackages = [ - pkgs.python313 - pkgs.net-tools - ]; - - # backup usb teather configuration - systemd.network.networks."80-usb-teather" = { - name = "enp0s20f0u2"; - networkConfig.DHCP = "yes"; - }; - systemd.services."disable-wifi-powersave" = { description = "Disable wifi powersaving using iw"; after = ["network.target"]; diff --git a/hosts/ganymede/secrets/collin-copyparty-password.age b/hosts/ganymede/secrets/collin-copyparty-password.age deleted file mode 100644 index af3ae6c..0000000 --- a/hosts/ganymede/secrets/collin-copyparty-password.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 azBilg hZH7PIwhHf7XWaPmri/OvgvJtlPEip5lqfFf77NKCVE -gbqmQLIN9edp8Om4VXD6wkI0+OymOcbBiKnunUXgqM0 --> ssh-ed25519 Jg4yWQ 0DeQ/sVqXTYjTBZS+lXVZWLDHYSYz836nbfNXejEdmQ -/b4pRvTK2+42G4Vp3WKun99pxGxYzAE3PzSD86Q5lVw ---- rXCPzVmtD1TorsW0ZV17ciC5y4rq5ZJDSm+1ssu+uVw -ygp]r͗|f)܊~ ssh-ed25519 azBilg vmw/nKIBoQoNUFX5L/30ll21pT0pC2aj/w2qjTc2nSM -x4udezFrc1+YG2ejgSVL6iIdPUgkiUeYxl0nijurqmE --> ssh-ed25519 Jg4yWQ X6KPKYcqIzzllcP96/VdMH+SHzvwy5L2Yf8VIjL7GRg -ZREY05ecsxqutY2VEktNqwX8pXvmXnVL8M9FnlIkQy4 ---- MGA/XzVEB308uJE/c/bLe0GKrLDVSxciKxTV54S4oDM -#;brLܐ&̓]WD5m ЃG`B6b \ No newline at end of file diff --git a/hosts/ganymede/secrets/copilot-token.age b/hosts/ganymede/secrets/copilot-token.age deleted file mode 100644 index 7dd6e51..0000000 --- a/hosts/ganymede/secrets/copilot-token.age +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEpnNHlXUSBDSlBB -cXJaNHU0V3VjVnB5czdya0lYMjBTdFFWRlhvWE5lVTRJenBhL3hRCmREcnJwUEo4 -UDVXQTFxdkk3ZXJrVE05cGZWT040U282bldhcm5QVkdSWW8KLT4gUCl4fUBGLWdy -ZWFzZSB4LHJZRVt7ICVYIjVGdlVbICR6fCBkdAp4T0pZM1hBRm9WcmFFQjJqaW9Y -Z2x5cE9mQk83U0pDRzdMUXozTkxjUC9FaW5MOUM4NjM3SlhTTnJvVldjK01KCm03 -TTBFdGtEWkZHVmc4RDVMc1QrNndNR2FHOXRreW5FZEhYdG9BdWZpYVBBb0ZSSFl2 -bFN1UUFWCi0tLSBVaUpmVjhibW5jWW9nS2pJV1JXVjJaZ2JYZ0VHQkY0emwrd1NL -QXFpNmN3Cv69mt8dZSWNQqM8qDledKrYS7PBZDoIXy+FivL42kaUxF0jXjHXefED -DsjubBCEK0OiAh6nyvuEn9wbSkaALmpqjMARM32QyAOiam2skY0LB8E= ------END AGE ENCRYPTED FILE----- diff --git a/hosts/ganymede/secrets/ganymede-wg-key.age b/hosts/ganymede/secrets/ganymede-wg-key.age deleted file mode 100644 index 2ef8256..0000000 --- a/hosts/ganymede/secrets/ganymede-wg-key.age +++ /dev/null @@ -1,5 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Jg4yWQ PMAfdBRZ9mLnral4UdHEtr3QWmk8j9lKek6XH8L6QCk -B342qgV/kGHvIt3hm8Yyd0yw7nHJ1kqV3UGLREhWbKA ---- mOBS3t1P5ZAIV8llDldbGC+F855Xy3Jd5V8tVrwisig -L\đg5w\̃9 A:= bLnOc" ssh-ed25519 Jg4yWQ NYO6CUksU6appmdib7CER3YYbcKoyn0wmB4YGTCeTE0 -tizx14UdvQftYrkDa3iXQYDp6JPWHfjDmFwjr11FBxQ --> ssh-ed25519 azBilg 3PYXHVdB2y2Y42ijOiv8LJ9c4WmeB5ivEPcehfS3Wns -tP/xCHzd31DydF5aCn1tJGudanXLl+DIPod7KFtglXQ ---- nbch7DRt1CYKBqzE9CeUIJgTMKIUCEA/CXVQZjkywfI -~}H <42)U{QK3%G^FW3GJy 1 \ No newline at end of file diff --git a/hosts/ganymede/secrets/wg-privkey.age b/hosts/ganymede/secrets/wg-privkey.age new file mode 100644 index 0000000..398a4b2 --- /dev/null +++ b/hosts/ganymede/secrets/wg-privkey.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGF6QmlsZyBQS20w +cEVsZkNQN3pkNm5mLzhIbEQ0ejVmcG9Md1d5YWd4WXBKa0tON3lZCk80a2lmQ3Zw +ZGlCRjZwdG5GY25RWFZrMktZYVZoWHZMeHFHUnJXSUlFa2sKLT4gc3NoLWVkMjU1 +MTkgSmc0eVdRIEIvcGNuVDVJWHV5UHpNMklXME1Sd2drNDYrTVk5aFUrbUN5SVVT +dVhSVEUKRG92b2NxZ0oxT3h0UGttZmhHb3gxT1VIMFVzOUQvSCt5RGEyL2NSRmp5 +SQotPiB2fGhLSSQuLWdyZWFzZQo5WlBvV1pWRkkvaTRHS0lha0R5R3A0cFFJbm04 +cTNGamZMNnlFMkZndy9QTlFlckZBd2J2eWt6R3l6MTVER0RQCkdrbG10bTRyMTZi +cQotLS0gazNldzNoSU1VOFdCTklsRFhjNVF6a2d5YlA2Q3gxdUVNbFFwU0dRSGhK +WQosSz+PG1ZS0BTINC2BVnJLFApgLIpos8pYgQz7MYdtcVrOSbhRA1VKxGT1zy3p +7o4Eu4MYzC9a7qmq547UKN0sjHhDRlmi9aH7zshN2A== +-----END AGE ENCRYPTED FILE----- diff --git a/hosts/ganymede/secrets/wireguard-privkey.age b/hosts/ganymede/secrets/wireguard-privkey.age deleted file mode 100644 index ee9130d..0000000 --- a/hosts/ganymede/secrets/wireguard-privkey.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 azBilg tvscfH96l4w2AkLjaczmtAJ3CKeU1mEPJWT82tR2HiY -F83pJqPj+qlFw4nb+ANCMJ7lOufSMluDIeWbaYvJkEU --> ssh-ed25519 Jg4yWQ SXz2kA4FODscXLqsNsCjuqKqBUXSkEx5SIpSdjGKpQU -mVg50RgaBauKlTCyHUYDTPZYnDJkppOthhMC+MAsiiE ---- dlTzxZODPVxlkdRP3HRJSK6BU3yEHrs1fo/sudC6EKo -dEV!Axr?z(YKمSukst]Mjzψ\D\Bs./2= \ No newline at end of file diff --git a/hosts/ganymede/wireguard.nix b/hosts/ganymede/wireguard.nix new file mode 100644 index 0000000..a1be5f7 --- /dev/null +++ b/hosts/ganymede/wireguard.nix @@ -0,0 +1,57 @@ +{ + config, + hosts, + pkgs, + ... +}: { + environment.systemPackages = [pkgs.wireguard-tools]; + + services.dnsmasq = { + enable = true; + settings = { + port = 5353; + local = "/ganymede/"; + address = "/.ganymede/10.100.0.1"; + listen-address = ["127.0.0.1" "10.100.0.1"]; + }; + }; + + boot.kernel.sysctl."net.ipv4.ip_forward" = 1; + + networking.firewall.allowedUDPPorts = [51820 5353]; + systemd.network.netdevs."50-wg0" = { + netdevConfig = { + Kind = "wireguard"; + Name = "wg0"; + MTUBytes = "1300"; + }; + wireguardConfig = { + PrivateKeyFile = config.collinux.secrets."wireguard-privkey".path; + ListenPort = 51820; + }; + wireguardPeers = [ + { + PublicKey = hosts.mercury.wg_pubkey; + AllowedIPs = ["${hosts.mercury.wg_ip}/32"]; + } + { + PublicKey = hosts.terra.wg_pubkey; + AllowedIPs = ["${hosts.terra.wg_ip}/32"]; + } + ]; + }; + systemd.network.networks."wg0" = { + matchConfig.Name = "wg0"; + address = ["${hosts.ganymede.wg_ip}/24"]; + dns = ["127.0.0.1:5353"]; + domains = ["~ganymede"]; + networkConfig = { + IPMasquerade = "ipv4"; + IPv4Forwarding = true; + }; + extraConfig = '' + DNSOverTLS=no + DNSSEC=no + ''; + }; +} -- cgit v1.3.1