From f5b37610b3835ea26757ef36d554ec598d53100c Mon Sep 17 00:00:00 2001
From: Jakub Stachurski <j.stachurski@student.utwente.nl>
Date: Wed, 19 Nov 2025 21:02:12 +0100
Subject: Add fix firewall and add tatuin

---
 flake.lock                        | 74 ++++++++++++++++++++++++++++++++++++++-
 home-modules/services/default.nix |  4 +--
 hosts/apocalypse/firewall.nix     | 46 ++++++++++++------------
 3 files changed, 99 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index e744054..0fb29e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,38 @@
 {
   "nodes": {
+    "crane": {
+      "locked": {
+        "lastModified": 1762538466,
+        "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "0cea393fffb39575c46b7a0318386467272182fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -57,7 +90,8 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "tatuin": "tatuin"
       }
     },
     "sops-nix": {
@@ -79,6 +113,44 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "tatuin": {
+      "inputs": {
+        "crane": "crane",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763244706,
+        "narHash": "sha256-TILRFbMuCYzphAvGnKhOEv//WxT83eA45LMOJttis4s=",
+        "owner": "Wilkuu-2",
+        "repo": "tatuin",
+        "rev": "23cd8de48424c9f0937fa645888c5cddabf45621",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Wilkuu-2",
+        "ref": "flake",
+        "repo": "tatuin",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/home-modules/services/default.nix b/home-modules/services/default.nix
index 3982b97..7506f86 100644
--- a/home-modules/services/default.nix
+++ b/home-modules/services/default.nix
@@ -3,5 +3,5 @@
 
   # Gnome keyring, very smort 
   services.gnome-keyring.enable = true;
-  home.packages = [ pkgs.gcr ]; 
-} 
+  home.packages = [ pkgs.gcr ];
+}
diff --git a/hosts/apocalypse/firewall.nix b/hosts/apocalypse/firewall.nix
index 8cf3e61..4be34a3 100644
--- a/hosts/apocalypse/firewall.nix
+++ b/hosts/apocalypse/firewall.nix
@@ -33,27 +33,29 @@ let
   ]; 
 in 
 {
-    networking.nftables.enable = true; 
-    networking.firewall = {
-        enable = true;
-        checkReversePath = false; 
-        allowedTCPPorts = baseTCP; 
-        allowedUDPPorts = baseUDP; 
-          allowedUDPPortRanges = baseUDPRanges;
-          allowedTCPPortRanges = baseTCPRanges;
-        interfaces = {
-          "nix-laptop" = {
-            allowedTCPPorts = secureTCP; 
-            allowedUDPPorts = secureUDP; 
-            allowedUDPPortRanges = secureUDPRanges;
-            allowedTCPPortRanges = secureTCPRanges;
-          };
-       };
-       trustedInterfaces = [
-          "docker0" 
-          "br-*" 
-          "veth*"
-       ];
+  networking.nftables.enable = true;
+  networking.firewall = {
+    enable = true;
+    checkReversePath = false;
+    allowedTCPPorts = baseTCP;
+    allowedUDPPorts = baseUDP;
+    allowedUDPPortRanges = baseUDPRanges;
+    allowedTCPPortRanges = baseTCPRanges;
+    interfaces = {
+      "nix-laptop" = {
+        allowedTCPPorts = secureTCP;
+        allowedUDPPorts = secureUDP;
+        allowedUDPPortRanges = secureUDPRanges;
+        allowedTCPPortRanges = secureTCPRanges;
+      };
     };
-}
+    trustedInterfaces = [
+      "docker0"
+      "br-*"
+      "veth*"
+      "vnet*"
+      "virbr*"
+    ];
 
+  };
+}
-- 
cgit v1.3.1