diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/ganymede/config.nix | 21 | ||||
| -rw-r--r-- | hosts/ganymede/ganymede-wg-key.age | 5 | ||||
| -rw-r--r-- | hosts/jupiter/config.nix | 21 | ||||
| -rw-r--r-- | hosts/jupiter/jupiter-wg-key.age | 5 | ||||
| -rw-r--r-- | hosts/mercury/config.nix | 26 | ||||
| -rw-r--r-- | hosts/mercury/mercury-wg-key.age | 6 | ||||
| -rw-r--r-- | hosts/wg_peers.nix | 39 |
7 files changed, 78 insertions, 45 deletions
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index 50ef29a..297d7c6 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -5,6 +5,27 @@ secrets = { "williams-psk".file = ./williams-psk.age; "caddy-env".file = ./caddy-env.age; + + "wg-key".file = ./ganymede-wg-key.age; + }; + + wireguard = { + enable = true; + ip = "100.100.0.1"; + gateway = "100.100.0.1"; + privateKeyFile = config.collinux.secrets."wg-key".path; + peers = [ + { + # mercury + publicKey = "EDDppGqbLfEwEcHLP3J+bxKVGW16fAcU83K/ZKR2h3A="; + ip = "100.100.0.5/32"; + } + { + # jupiter + publicKey = "Pi1PydaaEz9IcAZ+elH5HkzEa2D35P/tUy+9KKH6PHI="; + ip = "100.100.0.10/32"; + } + ]; }; terminal = { diff --git a/hosts/ganymede/ganymede-wg-key.age b/hosts/ganymede/ganymede-wg-key.age new file mode 100644 index 0000000..2ef8256 --- /dev/null +++ b/hosts/ganymede/ganymede-wg-key.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 Jg4yWQ PMAfdBRZ9mLnral4UdHEtr3QWmk8j9lKek6XH8L6QCk +B342qgV/kGHvIt3hm8Yyd0yw7nHJ1kqV3UGLREhWbKA +--- mOBS3t1P5ZAIV8llDldbGC+F855Xy3Jd5V8tVrwisig +L\đg5w\̃9 A:=
bLnOc"<JO;wJ[ .*/ 0
\ No newline at end of file diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix index a0c1583..cd4df81 100644 --- a/hosts/jupiter/config.nix +++ b/hosts/jupiter/config.nix @@ -1,9 +1,28 @@ -{ +{config, ...}: { collinux = { theme = "adwaita"; user.name = "collin"; + secrets = { + "wg-key".file = ./jupiter-wg-key.age; + }; + + wireguard = { + enable = true; + ip = "100.100.0.10"; + gateway = "100.100.0.1"; + privateKeyFile = config.collinux.secrets."wg-key".path; + peers = [ + { + # ganymede + publicKey = "WNLf8M6JGSHeRVvbAF6E/6oxAHeNxv6bXqqlmwMdvlk="; + ip = "100.100.0.0/24"; + endpoint = "williamsfam.us.com:51820"; + } + ]; + }; + desktop = { gnome.enable = true; gdm.enable = true; diff --git a/hosts/jupiter/jupiter-wg-key.age b/hosts/jupiter/jupiter-wg-key.age new file mode 100644 index 0000000..1c8bab8 --- /dev/null +++ b/hosts/jupiter/jupiter-wg-key.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 cIV9vQ WnCpZXPYLOuQkCmFuWfbcZloVPGcQN/2qMyd0Mg0hGE +oDN7vnXNXaDSIKXPa65Y0EvkOLv5W4IbEYOmGuGh2Ik +--- kfOs0NCAbxF4jFiHbBMgXQEjpsdz6e0blKH38NLFJBw +|Ra)F*jGk[#,ۚRN7oTw\JM &Dxn-`P]rz
\ No newline at end of file diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index 9ee29d0..590698a 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -1,18 +1,34 @@ -{pkgs, ...}: { +{config, ...}: { collinux = { theme = "catppuccin"; user.name = "collin"; + secrets = { + "wg-key".file = ./mercury-wg-key.age; + }; + + wireguard = { + enable = true; + ip = "100.100.0.5"; + gateway = "100.100.0.1"; + privateKeyFile = config.collinux.secrets."wg-key".path; + peers = [ + { + # ganymede + publicKey = "WNLf8M6JGSHeRVvbAF6E/6oxAHeNxv6bXqqlmwMdvlk="; + ip = "100.100.0.0/24"; + endpoint = "williamsfam.us.com:51820"; + } + ]; + }; + desktop = { wallpaper = ./wallpaper.jpg; - # gtk.enable = true; - greetd.enable = true; wm = { - # sway.enable = true; - niri.enable = true; + sway.enable = true; components.fuzzel.enable = true; components.dunst.enable = true; }; diff --git a/hosts/mercury/mercury-wg-key.age b/hosts/mercury/mercury-wg-key.age new file mode 100644 index 0000000..397f99c --- /dev/null +++ b/hosts/mercury/mercury-wg-key.age @@ -0,0 +1,6 @@ +age-encryption.org/v1 +-> ssh-ed25519 azBilg t589gal+hWbEiNH9vFQFb94UU2ElhLUwBpSg+6516wg +ZmRj3LLDctDPpDKGg3HvI4r7Ex6Sf0ERcPJlqUJXv0w +--- IpOHjk3TkNRT8aW1ocgCie/ljv/sWWFRuaYGhxlf948 +0:,̅;ǛTɿ NRAkllD:5%{.Й +V8Ƀ8nBR
\ No newline at end of file diff --git a/hosts/wg_peers.nix b/hosts/wg_peers.nix deleted file mode 100644 index 36fb465..0000000 --- a/hosts/wg_peers.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - "ganymede" = { - hub = { - domain = "williamsfam.us.com"; - port = 51823; - - ip_addr = "100.100.0.2"; - key = ""; - }; - }; - - "mercury" = { - spoke = { - ip_addr = "100.100.0.5"; - key = ""; - }; - }; - - "jupiter" = { - spoke = { - ip_addr = "100.100.0.10"; - key = ""; - }; - }; - - "terra" = { - spoke = { - ip_addr = "100.100.0.24"; - key = ""; - }; - }; - - "uranus" = { - spoke = { - ip_addr = "100.100.0.45"; - key = ""; - }; - }; -} |