diff --git a/sys/machines/hopper/lab/adguard.nix b/sys/machines/hopper/lab/adguard.nix index 36fca9f..f5279c5 100644 --- a/sys/machines/hopper/lab/adguard.nix +++ b/sys/machines/hopper/lab/adguard.nix @@ -1,4 +1,8 @@ { + vars, + lib, + ... +}: { services.adguardhome = { enable = true; mutableSettings = false; @@ -16,16 +20,17 @@ bootstrap_dns = ["1.1.1.1" "8.8.8.8"]; }; filtering = { - rewrites = [ - { - domain = "*.hopper.xun.host"; - answer = "100.115.105.144"; - } - { - domain = "hopper.xun.host"; - answer = "100.115.105.144"; - } - ]; + rewrites = lib.concatLists (lib.mapAttrsToList (n: v: [ + { + domain = "${n}.xun.host"; + answer = v; + } + { + domain = "*.${n}.xun.host"; + answer = v; + } + ]) + vars.tailnet); }; filters = [ { diff --git a/vars/default.nix b/vars/default.nix index 3db8b6b..25ed787 100644 --- a/vars/default.nix +++ b/vars/default.nix @@ -1,5 +1,9 @@ { domain = "xunuwu.xyz"; + tailnet = { + hopper = "100.115.105.144"; + nixdesk = "100.104.163.5"; + }; sshKeys = { xun_nixdesk = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqW5ZkBV2XCdF/ZhwC1DOfrgiLxCC2ym6BO7miHi05M xun@nixdesk"; xun_redmi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2FOrgCLSoewCnDH01SmRqsCb7cR3CA6AcULrlV+180 xun@redmi";