5 files changed, 360 insertions, 85 deletions

diff --git a/hosts/skadhi/default.nix b/hosts/skadhi/default.nix
index 66aa58d7..1f3f5306 100644
--- a/hosts/skadhi/default.nix
+++ b/hosts/skadhi/default.nix
@@ -1,36 +1,24 @@
 { flake, flakeInputs, pkgs, config, lib, ... }:
 {
   imports = with flake.nixosModules.systemProfiles; [
-    ./hw.nix
-    tmpfs-root default-locale openssh niri-unstable networkmanager lanzaboote zswap
-    flakeInputs.nixVirt.nixosModules.default
+    ./hw.nix ./fs.nix ./networking
+    tmpfs-root default-locale openssh lanzaboote zswap initrd-all-crypto-modules
   ];
 
   config = {
     system.stateVersion = "26.05";
 
-    fileSystems."/persistent".neededForBoot = true;
-    environment.persistence."/persistent" = {
-      hideMounts = true;
-      directories = [
-        "/nix"
-        "/root"
-        "/var/log"
-        "/var/lib/nixos"
-        "/var/lib/sops-nix"
-        "/var/lib/systemd"
-        config.boot.lanzaboote.pkiBundle
-      ];
-      timezone = true;
-    };
-
     boot = {
-      initrd.systemd = {
-        emergencyAccess = config.users.users.root.hashedPassword;
-        extraBin = {
-          "vim" = lib.getExe pkgs.vim;
-          "grep" = lib.getExe pkgs.gnugrep;
+      initrd = {
+        systemd = {
+          emergencyAccess = config.users.users.root.hashedPassword;
+          extraBin = {
+            "vim" = lib.getExe pkgs.vim;
+            "grep" = lib.getExe pkgs.gnugrep;
+          };
         };
+
+        kernelModules = [ "dm-integrity" ];
       };
 
       lanzaboote.configurationLimit = 15;
@@ -83,5 +71,16 @@
     };
 
     services.userborn.importLegacyState = false;
+
+    services.kmscon = {
+      enable = true;
+      config.hwaccel = true;
+    };
+
+    environment.persistence."/persistent".timezone = true;
+    time.timeZone = null;
+    systemd.tmpfiles.settings = {
+      "10-localtime"."/etc/localtime".L.argument = "/persistent/etc/localtime";
+    };
   };
 }
diff --git a/hosts/skadhi/fs.nix b/hosts/skadhi/fs.nix
new file mode 100644
index 00000000..64d49f7d
--- /dev/null
+++ b/hosts/skadhi/fs.nix
@@ -0,0 +1,82 @@
+{ flake, flakeInputs, pkgs, config, lib, ... }:
+{
+  imports = with flake.nixosModules.systemProfiles; [
+    disko
+  ];
+
+  config = {
+    fileSystems."/persistent".neededForBoot = true;
+    environment.persistence."/persistent" = {
+      hideMounts = true;
+      directories = [
+        "/nix"
+        "/root"
+        "/var/log"
+        "/var/lib/nixos"
+        "/var/lib/sops-nix"
+        "/var/lib/systemd"
+        config.boot.lanzaboote.pkiBundle
+      ];
+    };
+
+    disko.devices = {
+      disk.nvm = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "fmask=0033" "dmask=0022"
+                ];
+              };
+            };
+            luks = {
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "nvm";
+                extraFormatArgs = [
+                  "--cipher" "aegis128-random"
+                  "--key-size" "128"
+                  "--integrity" "aead"
+                ];
+                content = {
+                  type = "btrfs";
+                  extraArgs = let
+                    dirs = map (p: "/persistent/${p}") ["/etc"];
+                    subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"];
+                    restricted = map (p: "/persistent/${p}") ["/root"];
+                  in [
+                    "--csum" "blake2"
+                    "--compress" "zstd:15"
+                    "--rootdir" (toString (pkgs.runCommand "rootdir" {
+                    } ''
+                      mkdir $out
+                      install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") (dirs ++ subvols)}
+                      install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted}
+                    ''))
+                  ] ++ lib.concatMap (p: ["--subvol" p]) (subvols ++ restricted);
+                  subvolumes = {
+                    "/persistent".mountpoint = "/persistent";
+                    "/swap" = {
+                      mountpoint = "/.swap";
+                      swap.swapfile.size = "96G";
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/hosts/skadhi/hw.nix b/hosts/skadhi/hw.nix
index 0eb16b7a..ad353208 100644
--- a/hosts/skadhi/hw.nix
+++ b/hosts/skadhi/hw.nix
@@ -1,79 +1,20 @@
 { flake, flakeInputs, pkgs, config, lib, ... }:
 {
-  imports = with flake.nixosModules.systemProfiles; [
+  imports = [
     flakeInputs.nixos-hardware.nixosModules.framework-13-7040-amd
-    disko
   ];
 
   config = {
     hardware.framework.laptop13.audioEnhancement.enable = true;
+    hardware.enableRedistributableFirmware = true;
     services.fstrim.enable = false;
 
     services.udev.extraRules = ''
-      ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled"
+      ACTION=="add", SUBSYSTEM=="platform", DRIVER=="acpi-button", KERNEL=="PNP0C0D:00", ATTR{power/wakeup}="disabled"
       ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
       ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
    '';
 
     nixpkgs.system = "x86_64-linux";
-
-    disko.devices = {
-      disk.nvm = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "512M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [
-                  "fmask=0033" "dmask=0022"
-                ];
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "nvm";
-                extraFormatArgs = [
-                  "--cipher" "aegis128-random"
-                  "--key-size" "128"
-                  "--integrity" "aead"
-                ];
-                content = {
-                  type = "btrfs";
-                  extraArgs = let
-                    subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"];
-                    restricted = map (p: "/persistent/${p}") ["/root"];
-                  in [
-                    "--csum" "blake2"
-                    "--compress" "zstd:15"
-                    "--rootdir" (toString (pkgs.runCommand "rootdir" {
-                    } ''
-                      mkdir $out
-                      install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") subvols}
-                      install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted}
-                    ''))
-                  ] ++ lib.concatMap (p: ["--subvol" p]) subvols;
-                  subvolumes = {
-                    "/persistent".mountpoint = "/persistent";
-                    "/swap" = {
-                      mountpoint = "/.swap";
-                      swap.swapfile.size = "96G";
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
   };
 }
diff --git a/hosts/skadhi/networking/default.nix b/hosts/skadhi/networking/default.nix
new file mode 100644
index 00000000..ea5a62e2
--- /dev/null
+++ b/hosts/skadhi/networking/default.nix
@@ -0,0 +1,30 @@
+{ flake, config, ... }:
+{
+  imports = with flake.nixosModules.systemProfiles; [
+    networkmanager
+  ];
+
+  config = {
+    environment.persistence."/persistent".directories = [
+      "/etc/NetworkManager/system-connections"
+    ];
+
+    networking = {
+      domain = "yggdrasil";
+      search = [ "yggdrasil" ];
+      hosts = {
+        "127.0.0.1" = [ "${config.networking.hostName}.yggdrasil" config.networking.hostName ];
+        "::1" = [ "${config.networking.hostName}.yggdrasil" config.networking.hostName ];
+      };
+
+      firewall.enable = false;
+      nftables = {
+        enable = true;
+        rulesetFile = ./ruleset.nft;
+      };
+
+      useDHCP = false;
+      useNetworkd = true;
+    };
+  };
+}
diff --git a/hosts/skadhi/networking/ruleset.nft b/hosts/skadhi/networking/ruleset.nft
new file mode 100644
index 00000000..62339f69
--- /dev/null
+++ b/hosts/skadhi/networking/ruleset.nft
@@ -0,0 +1,223 @@
+define icmp_protos = { ipv6-icmp, icmp, igmp }
+
+table arp filter {
+  limit lim_arp {
+    rate over 50 mbytes/second burst 50 mbytes
+  }
+
+  counter arp-rx {}
+  counter arp-tx {}
+
+  counter arp-ratelimit-rx {}
+  counter arp-ratelimit-tx {}
+
+  chain input {
+    type filter hook input priority filter
+    policy accept
+
+    limit name lim_arp counter name arp-ratelimit-rx drop
+
+    counter name arp-rx
+  }
+
+  chain output {
+    type filter hook output priority filter
+    policy accept
+
+    limit name lim_arp counter name arp-ratelimit-tx drop
+
+    counter name arp-tx
+  }
+}
+
+table inet filter {
+  limit lim_reject {
+    rate over 1000/second burst 1000 packets
+  }
+
+  limit lim_icmp {
+    rate over 50 mbytes/second burst 50 mbytes
+  }
+
+  counter invalid-fw {}
+
+  counter fw-lo {}
+
+  counter reject-ratelimit-fw {}
+  counter reject-fw {}
+  counter reject-tcp-fw {}
+  counter reject-icmp-fw {}
+
+
+  counter invalid-rx {}
+  counter rx-lo {}
+  counter invalid-local4-rx {}
+  counter invalid-local6-rx {}
+
+  counter icmp-ratelimit-rx {}
+  counter icmp-rx {}
+
+  counter ssh-rx {}
+  counter mosh-rx {}
+  counter wg-rx {}
+  counter yggdrasil-gre-rx {}
+  counter miniserve-rx {}
+  counter ausweisapp2-rx {}
+
+  counter established-rx {}
+
+  counter reject-ratelimit-rx {}
+  counter reject-rx {}
+  counter reject-tcp-rx {}
+  counter reject-icmp-rx {}
+
+
+  counter tx-lo {}
+
+  counter icmp-ratelimit-tx {}
+  counter icmp-tx {}
+
+  counter ssh-tx {}
+  counter mosh-tx {}
+  counter wg-tx {}
+  counter yggdrasil-gre-tx {}
+  counter miniserve-tx {}
+
+  counter tx {}
+
+  counter fw-libvirt {}
+  counter libvirt-dhcp {}
+  counter libvirt-dns {}
+
+
+  chain forward_tmp {}
+  chain forward {
+    type filter hook forward priority filter
+    policy drop
+
+
+    ct state invalid log level debug prefix "drop invalid forward: " counter name invalid-fw drop
+
+
+    iifname lo counter name fw-lo accept
+
+    jump forward_tmp
+
+    iifname virbr0 oifname != {lo, wgrz, yggdrasil-wg-4, yggdrasil-wg-6, yggdrasil, ip6tnl, ip6gre, yggre-surtr-6, yggre-surtr-4, yggre-vidhar-4} counter name fw-libvirt accept
+    oifname virbr0 ct state {established, related} counter name fw-libvirt accept
+
+
+    limit name lim_reject log level debug prefix "drop forward: " counter name reject-ratelimit-fw drop
+    log level debug prefix "reject forward: " counter name reject-fw
+    meta l4proto tcp ct state new counter name reject-tcp-fw reject with tcp reset
+    ct state new counter name reject-icmp-fw reject
+  }
+
+  chain input_tmp {}
+  chain input {
+    type filter hook input priority filter
+    policy drop
+
+
+    ct state invalid log level debug prefix "drop invalid input: " counter name invalid-rx drop
+
+
+    iifname lo counter name rx-lo accept
+    iif != lo ip daddr 127.0.0.1/8 counter name invalid-local4-rx reject
+    iif != lo ip6 daddr ::1/128 counter name invalid-local6-rx reject
+
+    meta l4proto $icmp_protos limit name lim_icmp counter name icmp-ratelimit-rx drop
+    meta l4proto $icmp_protos counter name icmp-rx accept
+
+    jump input_tmp
+
+    tcp dport 22 counter name ssh-rx accept
+    udp dport 60000-61000 counter name mosh-rx accept
+
+    tcp dport 8080 counter name miniserve-rx accept
+    udp dport 24727 counter name ausweisapp2-rx accept
+
+    udp dport 51820-51822 counter name wg-rx accept
+    iifname "yggdrasil-wg-*" meta l4proto gre counter name yggdrasil-gre-rx accept
+
+    iifname virbr0 udp dport 67 counter name libvirt-dhcp accept
+    iifname virbr0 udp dport 547 counter name libvirt-dhcp accept
+    iifname virbr0 udp dport 53 counter name libvirt-dns accept
+    iifname virbr0 tcp dport 53 counter name libvirt-dns accept
+
+    iifname wgrz ip saddr 10.200.116.1 meta l4proto gre counter accept
+
+    ct state {established, related} counter name established-rx accept
+
+
+    limit name lim_reject log level debug prefix "drop input: " counter name reject-ratelimit-rx drop
+    log level debug prefix "reject input: " counter name reject-rx
+    meta l4proto tcp ct state new counter name reject-tcp-rx reject with tcp reset
+    ct state new counter name reject-icmp-rx reject
+  }
+
+  chain output {
+    type filter hook output priority filter
+    policy accept
+
+
+    oifname lo counter name tx-lo accept
+
+    meta l4proto $icmp_protos limit name lim_icmp counter name icmp-ratelimit-tx drop
+    meta l4proto $icmp_protos counter name icmp-tx accept
+
+
+    tcp sport 22 counter name ssh-tx
+    udp sport 60000-61000 counter name mosh-tx
+
+    udp sport 51820-51822 counter name wg-tx
+    iifname "yggdrasil-wg-*" meta l4proto gre counter name yggdrasil-gre-tx
+
+    tcp sport 8080 counter name miniserve-tx accept
+
+    oifname virbr0 udp sport 67 counter name libvirt-dhcp accept
+    oifname virbr0 udp sport 547 counter name libvirt-dhcp accept
+    oifname virbr0 udp sport 53 counter name libvirt-dns accept
+    oifname virbr0 tcp sport 53 counter name libvirt-dns accept
+
+
+    counter name tx
+  }
+}
+
+table ip nat {
+  counter libvirt-nat {}
+
+  chain postrouting_tmp {}
+  chain postrouting {
+    type nat hook postrouting priority srcnat
+    policy accept
+
+    iifname virbr0 oifname != virbr0 counter name libvirt-nat masquerade
+    jump postrouting_tmp
+  }
+}
+
+table ip6 nat {
+  counter libvirt-nat {}
+
+  chain postrouting {
+    type nat hook postrouting priority srcnat
+    policy accept
+
+    iifname virbr0 oifname != virbr0 counter name libvirt-nat masquerade
+  }
+}
+
+table ip mss_clamp {
+  counter libvirt-mss-clamp {}
+
+  chain postrouting_tmp {}
+  chain postrouting {
+    type filter hook postrouting priority mangle
+    policy accept
+
+    iifname virbr0 oifname != virbr0 tcp flags & (syn|rst) == syn counter name libvirt-mss-clamp tcp option maxseg size set rt mtu
+    jump postrouting_tmp
+  }
+}