diff options
Diffstat (limited to 'hosts/ganymede')
| -rw-r--r-- | hosts/ganymede/config.nix | 38 | ||||
| -rw-r--r-- | hosts/ganymede/nixos.nix | 1 |
2 files changed, 17 insertions, 22 deletions
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 |