From 35af4bab99da94845ebd6e9b2efae6a544d39b35 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Fri, 22 May 2026 10:23:58 -0500 Subject: LOTS OF TEMP STUFF --- hosts/ganymede/caddy.nix | 2 +- hosts/ganymede/config.nix | 69 +++++++++------------------- hosts/ganymede/nixos.nix | 5 ++ hosts/ganymede/secrets/wireguard-pk.age | 11 ----- hosts/ganymede/secrets/wireguard-privkey.age | 8 ++++ 5 files changed, 36 insertions(+), 59 deletions(-) delete mode 100644 hosts/ganymede/secrets/wireguard-pk.age create mode 100644 hosts/ganymede/secrets/wireguard-privkey.age (limited to 'hosts/ganymede') diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix index d10910c..a03fcdc 100644 --- a/hosts/ganymede/caddy.nix +++ b/hosts/ganymede/caddy.nix @@ -9,7 +9,7 @@ "github.com/tailscale/caddy-tailscale@v0.0.0-20251204171825-f070d146dd61" "github.com/caddy-dns/porkbun@v0.3.1" ]; - hash = "sha256-n0HVlpCkJITyEPc+ml7zCcYw9gy3r1YAXertd6zc2o0="; + hash = "sha256-FrAI7Fpz3bXclmKcizBMv/VI1hTAWT6DQnj7S09MwNY="; }); globalConfig = '' diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index 94d67ec..47b7f49 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -9,19 +9,6 @@ }; "caddy-env".file = ./secrets/caddy-env.age; - - # "collin-copyparty-password" = { - # file = ./secrets/collin-copyparty-password.age; - # owner = "copyparty"; - # }; - "collin-forgejo-password" = { - file = ./secrets/collin-forgejo-password.age; - owner = "forgejo"; - }; - "wireguard-pk" = { - file = ./secrets/wireguard-pk.age; - owner = "systemd-network"; - }; }; terminal = { @@ -41,6 +28,7 @@ ip = "192.168.50.2/24"; gateway = "192.168.50.1"; }; + wireless.static = { ssid = "williams"; pskFile = config.collinux.secrets."williams-psk".path; @@ -50,58 +38,45 @@ services = { sshd = { enable = true; - port = 22; - listenAddr = "0.0.0.0"; - rootLogin = true; - }; + public = true; - goaccess = { - enable = true; - privateUrl = "stats.ganymede"; - }; - btopweb = { - enable = true; - privateUrl = "btop.ganymede"; - }; - - cgit = { - enable = true; - privateUrl = "git.ganymede"; + conf.rootLogin = true; }; minecraft = { enable = true; - listenAddr = "0.0.0.0"; + public = true; }; - ngircd.enable = true; - - qbittorrent = { + ngircd = { enable = true; - privateUrl = "bittorrent.ganymede"; + public = true; }; - # copyparty = { - # enable = true; - # listenAddr = "0.0.0.0"; - # publicUrl = "up.williamsfam.us.com"; - # privateUrl = "files.ganymede"; - - # users.collin = { - # isAdmin = true; - # passwordFile = config.collinux.secrets."collin-copyparty-password".path; - # hasPublicDir = true; - # }; - # }; jta = { enable = true; publicUrl = "jta.williamsfam.us.com"; }; - ganyupload = { enable = true; publicUrl = "upld.williamsfam.us.com"; }; + goaccess = { + enable = true; + privateUrl = "stats.ganymede"; + }; + btopweb = { + enable = true; + privateUrl = "btop.ganymede"; + }; + qbittorrent = { + enable = true; + privateUrl = "bittorrent.ganymede"; + }; + cgit = { + enable = true; + privateUrl = "git.ganymede"; + }; caddy = { enable = true; diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix index 415509a..77e3ad5 100644 --- a/hosts/ganymede/nixos.nix +++ b/hosts/ganymede/nixos.nix @@ -16,6 +16,11 @@ facter.reportPath = ./facter.json; + environment.systemPackages = [ + pkgs.python313 + pkgs.net-tools + ]; + # backup usb teather configuration systemd.network.networks."80-usb-teather" = { name = "enp0s20f0u2"; diff --git a/hosts/ganymede/secrets/wireguard-pk.age b/hosts/ganymede/secrets/wireguard-pk.age deleted file mode 100644 index c8e365a..0000000 --- a/hosts/ganymede/secrets/wireguard-pk.age +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEpnNHlXUSBxZlFt -bWR5NFJ1N0FBMkc2eThudnI1TnQ2WFNzK2NsVzdtaVgzQXRYNFhzCkJXTGUzSU5E -U05jYnEvQXVwZEhIU1FMamt3bUM4UnB3bmNEZWQzZDlBSXcKLT4gc09lRVkkfTQt -Z3JlYXNlIHMgSHYsVTZxOzgKWVJHbG1Ua3NONE9QYjVCNEQzOXQrNlZXRTBKQ3JW -elpKeGwvYVgrOVVMRStrUGl0ay9HYmNOcW8xZFJER2tXWApPcUZxY2I5aDBoMVBO -bmNxWE9YakZqL2h2dlFVYVdra0JrZjMKLS0tIGJWQlRmaVREL242aVdudFVOZTd4 -V1BnTnM3aTdGY1lUcm81VUVkd1QzcFUKMMrCSdf0J/xuvhvpktJO/GbpBp8ZnXue -S0TTS/s3zCx8wCT70j/C6alX1CeMX+RpJwiba5BpvTuphGrgrMjMtA0oYDCRZzeQ -1EtdX+A= ------END AGE ENCRYPTED FILE----- diff --git a/hosts/ganymede/secrets/wireguard-privkey.age b/hosts/ganymede/secrets/wireguard-privkey.age new file mode 100644 index 0000000..ee9130d --- /dev/null +++ b/hosts/ganymede/secrets/wireguard-privkey.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 azBilg tvscfH96l4w2AkLjaczmtAJ3CKeU1mEPJWT82tR2HiY +F83pJqPj+qlFw4nb+ANCMJ7lOufSMluDIeWbaYvJkEU +-> ssh-ed25519 Jg4yWQ SXz2kA4FODscXLqsNsCjuqKqBUXSkEx5SIpSdjGKpQU +mVg50RgaBauKlTCyHUYDTPZYnDJkppOthhMC+MAsiiE +--- dlTzxZODPVxlkdRP3HRJSK6BU3yEHrs1fo/sudC6EKo +ÌdŸEV!Axë£r¤?z(YKÙ…ÁÐÆSäuŠÓkst]<¸o(Þ¶Ø +š>MüïjzψÄÑ\ÆDè\B¯«sÞý./ð2Œ= \ No newline at end of file -- cgit v1.3.1