From 9e0867dcd9e0caaa5ef73061e9c7a3375d45f0fb Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Thu, 5 Sep 2024 02:49:29 -0700
Subject: Bump

---
 modules/system/networking/default.nix           |  3 +--
 modules/system/networking/fail2ban.nix          | 20 --------------------
 modules/system/networking/firewall.nix          | 15 ---------------
 modules/system/networking/firewall/default.nix  | 11 +++++++++++
 modules/system/networking/firewall/fail2ban.nix | 20 ++++++++++++++++++++
 modules/system/networking/vpn/tailscale.nix     | 15 +++++++++++++--
 6 files changed, 45 insertions(+), 39 deletions(-)
 delete mode 100644 modules/system/networking/fail2ban.nix
 delete mode 100644 modules/system/networking/firewall.nix
 create mode 100644 modules/system/networking/firewall/default.nix
 create mode 100644 modules/system/networking/firewall/fail2ban.nix

diff --git a/modules/system/networking/default.nix b/modules/system/networking/default.nix
index 96f89d0..7478a17 100644
--- a/modules/system/networking/default.nix
+++ b/modules/system/networking/default.nix
@@ -1,9 +1,8 @@
 {
   imports = [
+    ./firewall
     ./vpn
     ./dhcpcd.nix
-    ./fail2ban.nix
-    ./firewall.nix
     ./ipv6.nix
     ./loopback.nix
     ./networkmanager.nix
diff --git a/modules/system/networking/fail2ban.nix b/modules/system/networking/fail2ban.nix
deleted file mode 100644
index 6311b14..0000000
--- a/modules/system/networking/fail2ban.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  services.fail2ban = {
-    enable = false;
-    banaction = "nftables-multiport";
-    banaction-allports = lib.mkDefault "nftables-allport";
-
-    extraPackages = with pkgs; [
-      nftables
-      ipset
-    ];
-
-    ignoreIP = [
-      "10.0.0.0/8"
-      "172.16.0.0/12"
-      "100.64.0.0/16"
-      "192.168.0.0/16"
-    ];
-  };
-}
diff --git a/modules/system/networking/firewall.nix b/modules/system/networking/firewall.nix
deleted file mode 100644
index 39c5b03..0000000
--- a/modules/system/networking/firewall.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) mkForce;
-in
-{
-  networking.firewall = {
-    enable = true;
-    allowedUDPPorts = mkForce [ ];
-    allowedTCPPorts = mkForce [ ];
-    allowPing = mkForce false;
-    logReversePathDrops = true;
-    logRefusedConnections = false;
-    checkReversePath = mkForce false;
-  };
-}
diff --git a/modules/system/networking/firewall/default.nix b/modules/system/networking/firewall/default.nix
new file mode 100644
index 0000000..074f398
--- /dev/null
+++ b/modules/system/networking/firewall/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = [ ./fail2ban.nix ];
+
+  networking.firewall = {
+    enable = true;
+    allowPing = false;
+    logReversePathDrops = true;
+    logRefusedConnections = false;
+    checkReversePath = "loose";
+  };
+}
diff --git a/modules/system/networking/firewall/fail2ban.nix b/modules/system/networking/firewall/fail2ban.nix
new file mode 100644
index 0000000..6311b14
--- /dev/null
+++ b/modules/system/networking/firewall/fail2ban.nix
@@ -0,0 +1,20 @@
+{ pkgs, lib, ... }:
+{
+  services.fail2ban = {
+    enable = false;
+    banaction = "nftables-multiport";
+    banaction-allports = lib.mkDefault "nftables-allport";
+
+    extraPackages = with pkgs; [
+      nftables
+      ipset
+    ];
+
+    ignoreIP = [
+      "10.0.0.0/8"
+      "172.16.0.0/12"
+      "100.64.0.0/16"
+      "192.168.0.0/16"
+    ];
+  };
+}
diff --git a/modules/system/networking/vpn/tailscale.nix b/modules/system/networking/vpn/tailscale.nix
index 5d51594..21f471a 100644
--- a/modules/system/networking/vpn/tailscale.nix
+++ b/modules/system/networking/vpn/tailscale.nix
@@ -1,4 +1,15 @@
+{ config, ... }:
 {
-  services.tailscale.enable = true;
-  networking.firewall.trustedInterfaces = [ "tailscale0" ];
+  networking.firewall.trustedInterfaces = [ "${config.services.tailscale.interfaceName}" ];
+
+  services.tailscale = {
+    enable = true;
+    useRoutingFeatures = "both";
+  };
+
+  # <https://tailscale.com/kb/1019/subnets/?tab=linux#step-1-install-the-tailscale-client>
+  boot.kernel.sysctl = {
+    "net.ipv4.ip_forward" = true;
+    "net.ipv6.conf.all.forwarding" = true;
+  };
 }
-- 
cgit v1.2.3