From b2ec9599373c7e0f5428694c5712c8fc0be06264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 14 Mar 2024 09:35:13 +0100 Subject: Load of updates and module simplification --- nixos/modules/hosts.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'nixos/modules/hosts.nix') diff --git a/nixos/modules/hosts.nix b/nixos/modules/hosts.nix index 8a9318c..b9a40a6 100644 --- a/nixos/modules/hosts.nix +++ b/nixos/modules/hosts.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let inherit (lib) mkOption types mkIf; @@ -20,6 +19,7 @@ in { description = "Use my personal static hosts"; }; vpn = staticZoneOption; + wg = staticZoneOption; spt = staticZoneOption; adm = staticZoneOption; }; @@ -38,6 +38,17 @@ in { "spt-omnia" = "10.8.0.50"; "adm-omnia" = "10.8.0.51"; }; + wg = { + "lipwig" = "10.8.1.1"; + # Portable + "binky" = "10.8.1.10"; + "android" = "10.8.1.30"; + # Endpoints + "spt-omnia" = "10.8.1.50"; + "adm-omnia" = "10.8.1.51"; + # Endpoints without routing + "dean" = "10.8.1.59"; + }; spt = { # Network "omnia" = "10.8.2.1"; @@ -74,6 +85,13 @@ in { "${cnf.vpn.binky}" = ["binky.vpn"]; "${cnf.vpn.spt-omnia}" = ["spt.vpn"]; "${cnf.vpn.adm-omnia}" = ["adm.vpn"]; + # Wireguard + "${cnf.wg.lipwig}" = ["lipwig.wg"]; + "${cnf.wg.binky}" = ["binky.wg"]; + "${cnf.wg.android}" = ["android.wg"]; + "${cnf.wg.spt-omnia}" = ["spt.wg"]; + "${cnf.wg.adm-omnia}" = ["adm.wg"]; + "${cnf.wg.dean}" = ["dean.wg"]; # Spt "${cnf.spt.omnia}" = ["omnia.spt"]; "${cnf.spt.mox}" = ["mox.spt"]; -- cgit v1.2.3