diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix index b1d4bcc..f19c77c 100644 --- a/hosts/andromache/default.nix +++ b/hosts/andromache/default.nix @@ -33,10 +33,6 @@ in bluetooth.enable = true; bootloader.enable = true; desktop.niri.enable = true; - firewall = { - enable = true; - allowedTCPPorts = [ 22 ]; - }; gaming.enable = true; git.enable = true; keyboard.enable = true; diff --git a/hosts/astyanax/default.nix b/hosts/astyanax/default.nix index b0d2cad..22c36e9 100644 --- a/hosts/astyanax/default.nix +++ b/hosts/astyanax/default.nix @@ -67,11 +67,6 @@ in docker.enable = true; nfc.enable = true; - firewall = { - enable = true; - allowedTCPPorts = [ 22 ]; - }; - hardware = { cpu.intel.updateMicrocode = true; # https://wiki.nixos.org/wiki/Intel_Graphics diff --git a/modules/firewall/default.nix b/modules/firewall/default.nix deleted file mode 100644 index 077cdef..0000000 --- a/modules/firewall/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, config, ... }: - -let - inherit (lib) mkEnableOption mkOption types; -in -{ - options.firewall = { - enable = mkEnableOption "firewall"; - - allowedTCPPorts = mkOption { - type = types.listOf types.port; - default = [ ]; - }; - - allowedUDPPorts = mkOption { - type = types.listOf types.port; - default = [ ]; - }; - }; - - config = lib.mkIf config.firewall.enable { - networking.firewall = { - enable = true; - inherit (config.firewall) allowedTCPPorts allowedUDPPorts; - }; - }; -} diff --git a/modules/wol/default.nix b/modules/wol/default.nix index 7323738..837740e 100644 --- a/modules/wol/default.nix +++ b/modules/wol/default.nix @@ -28,6 +28,6 @@ in inherit (iface) macAddress; }) config.wol.interfaces; - # firewall.allowedUDPPorts = [ 9 ]; + # networking.firewall.allowedUDPPorts = [ 9 ]; }; }