diff --git a/lib/luj.nix b/lib/luj.nix index 0835e3f..3e471cc 100644 --- a/lib/luj.nix +++ b/lib/luj.nix @@ -1,4 +1,4 @@ -inputs: lib: +lib: with lib; let modules = [ @@ -43,148 +43,6 @@ let tld = "luj"; machines = { - lisa = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4 = { - public = "212.129.40.11"; - vpn = "100.100.45.12"; - }; - ipv6 = { - public = "2a01:e0a:5f9:9681:5880:c9ff:fe9f:3dfb"; - vpn = "fd7a:115c:a1e0::c"; - }; - }; - akhaten = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.unstable; - hm_version = inputs.home-manager-unstable; - ipv4 = { - public = "163.172.91.82"; - vpn = "100.100.45.33"; - }; - }; - - x2100 = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs_patched; - hm_version = inputs.home-manager-unstable; - # TODO: Fix colmena deployment - ipv4.public = "127.0.0.1"; - }; - fischer = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs_patched; - hm_version = inputs.home-manager-unstable; - # TODO: Fix colmena deployment - ipv4.public = "127.0.0.1"; - }; - enigma = { - inherit tld; - arch = "aarch64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4.vpn = "100.100.45.21"; - }; - lambda = { - inherit tld; - arch = "aarch64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4 = { - public = "141.145.197.219"; - vpn = "100.100.45.13"; - }; - ipv6 = { - public = "2603:c027:c001:89aa:aad9:34b3:f3c9:924f"; - vpn = "fd7a:115c:a1e0::d"; - }; - }; - - tower = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4 = { - public = "82.67.34.230"; - local = "192.168.0.103"; - vpn = "100.100.45.9"; - }; - ipv6 = { - public = "2a01:e0a:de4:a0e1:8ec7:b5d2:f663:a67a"; - vpn = "fd7a:115c:a1e0::9"; - }; - }; - - gustave = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4 = { - public = "82.67.34.230"; - local = "192.168.0.90"; - vpn = "100.100.45.24"; - }; - ipv6 = { - public = "2a01:e0a:de4:a0e1:eb2:aaaa::45"; - vpn = "fd7a:115c:a1e0::18"; - }; - }; - - core-security = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4 = { - public = "82.67.34.230"; - local = "192.168.0.175"; - vpn = "100.100.45.14"; - }; - ipv6 = { - public = "2a01:e0a:de4:a0e1:40f0:8cff:fe31:3e94"; - vpn = "fd7a:115c:a1e0::e"; - }; - }; - - core-data = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4 = { - public = "82.67.34.230"; - local = "192.168.0.66"; - vpn = "100.100.45.26"; - }; - ipv6 = { - public = "2a01:e0a:de4:a0e1:be24:11ff:fe09:638d"; - vpn = "fd7a:115c:a1e0::1a"; - }; - }; - - nuage = { - inherit tld; - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs; - hm_version = inputs.home-manager; - ipv4 = { - public = "82.67.34.230"; - local = "192.168.0.101"; - vpn = "100.100.45.28"; - }; - ipv6 = { - public = "2a01:e0a:de4:a0e1:95c9:b2e2:e999:1a45"; - vpn = "fd7a:115c:a1e0::1c"; - }; - }; doma-backups = { inherit tld;