diff --git a/flake.nix b/flake.nix index 8c86668..4afb27a 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,6 @@ ./machines ./routers ./inventories - ./overlays ./modules/clan/flake-module.nix ./modules/nixos/flake-module.nix ]; diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index d370082..0000000 --- a/lib/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -final: prev: -let - callLibs = file: import file { lib = prev; }; -in -{ - lib = prev.lib.extend ( - finalLib: prevLib: { - getInterface = callLibs ./zerotier-interface.nix { }; - } - ); -} diff --git a/modules/clan/phonebox/default.nix b/modules/clan/phonebox/default.nix index 815a854..d97328b 100644 --- a/modules/clan/phonebox/default.nix +++ b/modules/clan/phonebox/default.nix @@ -25,6 +25,7 @@ { lib, config, + pkgs, ... }: let @@ -183,8 +184,11 @@ ]; networking.firewall.interfaces = let + matchAll = if !config.networking.nftables.enable then "zt+" else "zt*"; in - { }; + { + "${matchAll}".allowedTCPPorts = [ 80 ]; + }; services.asterisk = { enable = lib.mkDefault true; diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index d0d24c1..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - flake.overlays = { - libsOverlay = import ../lib/default.nix; - }; -}