From 6e01e14b3386a7fd138d61de9351cc28741fe429 Mon Sep 17 00:00:00 2001 From: boyreau Date: Wed, 2 Sep 2026 08:28:25 +0200 Subject: [PATCH] moved security module to dns module and multiple submodules --- machines/memere/default.nix | 3 ++- machines/niczos/default.nix | 3 ++- modules/default.nix | 1 - modules/dns.nix | 11 +++++++++++ modules/security.nix | 31 ------------------------------- modules/security/default.nix | 6 ++++++ modules/security/firewall.nix | 9 +++++++++ modules/security/misc.nix | 13 +++++++++++++ 8 files changed, 43 insertions(+), 34 deletions(-) delete mode 100644 modules/default.nix create mode 100644 modules/dns.nix delete mode 100644 modules/security.nix create mode 100644 modules/security/default.nix create mode 100644 modules/security/firewall.nix create mode 100644 modules/security/misc.nix diff --git a/machines/memere/default.nix b/machines/memere/default.nix index bddb68f..5c6ace3 100644 --- a/machines/memere/default.nix +++ b/machines/memere/default.nix @@ -2,7 +2,8 @@ imports = [ /etc/nixos/roles/desktop.nix - /etc/nixos/modules/security.nix + /etc/nixos/modules/dns.nix + /etc/nixos/modules/security /etc/nixos/modules/nix.nix /etc/nixos/modules/tailscale.nix /etc/nixos/modules/ssl.nix diff --git a/machines/niczos/default.nix b/machines/niczos/default.nix index a0dbe8f..f6e68b7 100644 --- a/machines/niczos/default.nix +++ b/machines/niczos/default.nix @@ -11,8 +11,9 @@ in /etc/nixos/roles/desktop.nix # module + /etc/nixos/modules/security + /etc/nixos/modules/dns.nix /etc/nixos/modules/nix.nix - /etc/nixos/modules/security.nix /etc/nixos/modules/sops.nix /etc/nixos/modules/ssl.nix /etc/nixos/modules/tailscale.nix diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index ffcd441..0000000 --- a/modules/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ } diff --git a/modules/dns.nix b/modules/dns.nix new file mode 100644 index 0000000..7c9feab --- /dev/null +++ b/modules/dns.nix @@ -0,0 +1,11 @@ +{ + networking = { + nameservers = [ + "45.90.28.0" + "2a07:a8c0::" + "45.90.30.0" + "2a07:a8c1::" + ]; + networkmanager.dns = "none"; + }; +} diff --git a/modules/security.nix b/modules/security.nix deleted file mode 100644 index ae21ad2..0000000 --- a/modules/security.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - # Classic deny all - networking.nftables.enable = true; - networking.firewall = { - enable = true; - allowedTCPPorts = [ ]; - allowedUDPPorts = [ ]; - }; - - networking = { - nameservers = [ - "45.90.28.0" - "2a07:a8c0::" - "45.90.30.0" - "2a07:a8c1::" - ]; - networkmanager.dns = "none"; - }; - - # No fork bomb - environment.etc."security/limits.conf".text = '' - * soft nproc 2000 - * hard nproc 4000 - ''; - - # Wheel group may edit the configuration. - systemd.tmpfiles.rules = [ - "Z /etc/nixos ~6070 root wheel" - "A /etc/nixos - - - - d:u::rwx,d:g::-,d:g:wheel:rwx,d:mask:rwx" - ]; -} diff --git a/modules/security/default.nix b/modules/security/default.nix new file mode 100644 index 0000000..2f3ffad --- /dev/null +++ b/modules/security/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./firewall.nix + ./misc.nix + ]; +} diff --git a/modules/security/firewall.nix b/modules/security/firewall.nix new file mode 100644 index 0000000..11513d9 --- /dev/null +++ b/modules/security/firewall.nix @@ -0,0 +1,9 @@ +{ + # Deny all, specific modules may open things + networking.nftables.enable = true; + networking.firewall = { + enable = true; + allowedTCPPorts = [ ]; + allowedUDPPorts = [ ]; + }; +} diff --git a/modules/security/misc.nix b/modules/security/misc.nix new file mode 100644 index 0000000..207e4eb --- /dev/null +++ b/modules/security/misc.nix @@ -0,0 +1,13 @@ +{ + # No fork bomb + environment.etc."security/limits.conf".text = '' + * soft nproc 2000 + * hard nproc 4000 + ''; + + # Wheel group may edit the configuration. + systemd.tmpfiles.rules = [ + "Z /etc/nixos ~6070 root wheel" + "A /etc/nixos - - - - d:u::rwx,d:g::-,d:g:wheel:rwx,d:mask:rwx" + ]; +}