1 files changed, 14 insertions, 19 deletions

diff --git a/hosts/skadhi/default.nix b/hosts/skadhi/default.nix
index 62823488..1f3f5306 100644
--- a/hosts/skadhi/default.nix
+++ b/hosts/skadhi/default.nix
@@ -1,29 +1,13 @@
 { 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 = {
@@ -34,7 +18,7 @@
           };
         };
 
-        luks.cryptoModules = [ "aegis128" ];
+        kernelModules = [ "dm-integrity" ];
       };
 
       lanzaboote.configurationLimit = 15;
@@ -87,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";
+    };
   };
 }