diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/ganymede/config.nix | 16 | ||||
| -rw-r--r-- | hosts/ganymede/nixos.nix | 27 | ||||
| -rw-r--r-- | hosts/ganymede/wireguard-pk.age | 11 | ||||
| -rw-r--r-- | hosts/mercury/config.nix | 4 | ||||
| -rw-r--r-- | hosts/mercury/hjem.nix | 2 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 11 |
6 files changed, 60 insertions, 11 deletions
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index db684ae..3f8c6e4 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -18,6 +18,10 @@ file = ./collin-forgejo-password.age; owner = "forgejo"; }; + "wireguard-pk" = { + file = ./wireguard-pk.age; + owner = "root"; + }; }; terminal = { @@ -33,13 +37,11 @@ }; system.network = { - networkd = { - enable = true; - static = { - ip = "192.168.50.2/24"; - gateway = "192.168.50.1"; - }; - + static = { + ip = "192.168.50.2/24"; + gateway = "192.168.50.1"; + }; + wireless.static = { ssid = "williams"; pskFile = config.collinux.secrets."williams-psk".path; }; diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix index be59083..8b5cbf4 100644 --- a/hosts/ganymede/nixos.nix +++ b/hosts/ganymede/nixos.nix @@ -30,6 +30,33 @@ wantedBy = ["default.target"]; }; + # VPN to server + systemd.network = { + netdevs."10-wg0" = { + netdevConfig = { + Kind = "wireguard"; + Name = "wg0"; + }; + wireguardConfig = { + PrivateKeyFile = config.collinux.secrets."wireguard-pk".path; + ListenPort = 51820; + }; + wireguardPeers = [ + { + PublicKey = "seOq75FUGb+KThvOXCEAGdabWbb+jTRUntITpuAPgWA="; + AllowedIPs = "0.0.0.0/0"; + PersistentKeepalive = 25; + } + ]; + }; + networks."wg0" = { + matchConfig.Name = "wg0"; + address = ["10.100.0.2/24"]; + DHCP = "no"; + networkConfig.IPv6AcceptRA = false; + }; + }; + services.fail2ban.enable = true; # merge logs from subdomains diff --git a/hosts/ganymede/wireguard-pk.age b/hosts/ganymede/wireguard-pk.age new file mode 100644 index 0000000..c8e365a --- /dev/null +++ b/hosts/ganymede/wireguard-pk.age @@ -0,0 +1,11 @@ +-----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/mercury/config.nix b/hosts/mercury/config.nix index abf38fb..cdf24d9 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -36,9 +36,9 @@ }; network = { - iwd.enable = true; - networkd.enable = true; + wireless.dynamic = true; }; + audio.enable = true; bluetooth.enable = true; }; diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix index b50dd6f..9e0ca77 100644 --- a/hosts/mercury/hjem.nix +++ b/hosts/mercury/hjem.nix @@ -33,7 +33,7 @@ in { inputs.glide-browser.packages."x86_64-linux".default inputs.vermilion.packages."x86_64-linux".default - (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;}) + # (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;}) (pkgs.callPackage ../../pkgs/yo.nix {inherit inputs;}) ]; diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index f820b7f..fee1a5e 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -53,9 +53,18 @@ ]; programs.ssh.extraConfig = '' - Host ganymede + Match host ganymede exec "nc -z -w1 192.168.50.2 2222" HostName 192.168.50.2 Port 2222 + + Host ganymede + HostName williamsfam.us.com + Port 22 + + Host gliese + HostName 20.251.8.247 + Port 22 + IdentityFile ~/Gliese_key_2.pem ''; programs.firefox.policies.ExtensionSettings = { |