diff --git a/machine/catacomb/default.nix b/machine/catacomb/default.nix index 8d2feb9..1999676 100644 --- a/machine/catacomb/default.nix +++ b/machine/catacomb/default.nix @@ -1,8 +1,6 @@ { pkgs, lib, ... }: -let - beatific = import ../../modules/beatific-config.nix; -in { +{ imports = [ ./hardware-configuration.nix ./fileserver.nix diff --git a/modules/beatific-config.nix b/modules/beatific-config.nix deleted file mode 100644 index cb25cda..0000000 --- a/modules/beatific-config.nix +++ /dev/null @@ -1,23 +0,0 @@ -# Shared configuration values -let - nebula-port = 4242; - empyrean-vpn-ip = "10.22.20.1"; - empyrean-ext-dns = "vpn.alogoulogoi.com"; -in { - nebula-defaults = { - listen.port = nebula-port; - - # Don't filter at the VPN level - firewall.outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; - firewall.inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; - - settings = { - # Enable UDP holepunching both ways, which allows nodes to establish more direct connections with each other - punchy = { punch = true; response = true; }; - }; - }; - - inherit empyrean-vpn-ip; - empyrean-host-map = { ${empyrean-vpn-ip} = [ "${empyrean-ext-dns}:${toString nebula-port}" ]; }; -} -