diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index cde372b..08b6b10 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -23,6 +23,7 @@ in { ../../apps/gaming.nix ../../graphics ../../pwrMgmt + ../../networking/core.nix ../../sound/pipewire.nix ../../sound/shairport.nix ../../virtualization/podman.nix @@ -140,7 +141,7 @@ in { }; # Core networking module (see ../../networking/core.nix) - networking = { + network = { firewall.enable = true; networkmanager.enable = true; }; diff --git a/modules/machine/valefor/configuration.nix b/modules/machine/valefor/configuration.nix index bb96494..9e657c5 100644 --- a/modules/machine/valefor/configuration.nix +++ b/modules/machine/valefor/configuration.nix @@ -85,7 +85,7 @@ }; # Core networking module (see ../../networking/core.nix) - networking = { + network = { firewall.enable = true; networkmanager.enable = true; }; diff --git a/modules/networking/core.nix b/modules/networking/core.nix index cc0eada..613237c 100644 --- a/modules/networking/core.nix +++ b/modules/networking/core.nix @@ -3,10 +3,9 @@ lib, ... }: let - cfg = config.networking; + cfg = config.network; in { - options.networking = { - # Firewall Configuration + options.network = { firewall = { enable = lib.mkEnableOption { type = lib.types.bool; @@ -111,7 +110,7 @@ in { }; config = { - networking.firewall = { + network.firewall = { enable = cfg.firewall.enable; allowedTCPPorts =