From 5a56c5ac6073275f8de3c01437cd7f5847a8e8c5 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Fri, 21 Mar 2025 19:47:53 -0400
Subject: [PATCH] Move more things over, modify Kitty

---
 hosts/envy/disko/default.nix       |  6 +++---
 hosts/intuos/disko/default.nix     |  4 ++--
 hosts/kitty/default.nix            |  1 -
 hosts/kitty/disko/default.nix      | 16 +++++-----------
 hosts/kitty/users/corn/default.nix |  2 +-
 hosts/pear/disko/default.nix       |  6 +++---
 hosts/prophet/disko/default.nix    |  4 ++--
 hosts/redmond/disko/default.nix    |  6 +++---
 8 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/hosts/envy/disko/default.nix b/hosts/envy/disko/default.nix
index cd0a3a89..8c7a5613 100644
--- a/hosts/envy/disko/default.nix
+++ b/hosts/envy/disko/default.nix
@@ -67,9 +67,9 @@
 	          mountpoint = "/persist";
 	          mountOptions = [ "compress=zstd" "noatime" "ssd" ];
 	        };
-	        "/persist/.snapshots" = { };
-	        "/persist/home/${config.sysusers.main}" = { };
-	        "/persist/home/${config.sysusers.main}/.snapshots" = { };
+                "/persist/.snapshots" = { };
+                "/persist/home" = { };
+                "/persist/home/.snapshots" = { };
               };
             };
           };
diff --git a/hosts/intuos/disko/default.nix b/hosts/intuos/disko/default.nix
index 36d1bd7e..093548d1 100644
--- a/hosts/intuos/disko/default.nix
+++ b/hosts/intuos/disko/default.nix
@@ -68,8 +68,8 @@
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
                 "/persist/.snapshots" = { };
-                "/persist/home/${config.sysusers.main}" = { };
-                "/persist/home/${config.sysusers.main}/.snapshots" = { };
+                "/persist/home" = { };
+                "/persist/home/.snapshots" = { };
               };
             };
           };
diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index b069babb..a74be608 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -23,7 +23,6 @@
 
   system = {
     desktop.enable = true;
-    lanzaboote.enable = true;
     stateVersion = "24.11";
   };
 }
diff --git a/hosts/kitty/disko/default.nix b/hosts/kitty/disko/default.nix
index 36d1bd7e..3d15729b 100644
--- a/hosts/kitty/disko/default.nix
+++ b/hosts/kitty/disko/default.nix
@@ -21,17 +21,11 @@
                 mountOptions = [ "umask=0077" ];
               };
             };
-            luks = {
+            main = {
               size = "100%";
               content = {
-                type = "luks";
-                name = "${config.networking.hostName}-disk";
-                settings.allowDiscards = true;
-                passwordFile = "/tmp/secret.key";
-                content = {
-                  type = "lvm_pv";
-                  vg = "${config.networking.hostName}";
-                };
+                type = "lvm_pv";
+                vg = "${config.networking.hostName}";
               };
             };
           };
@@ -68,8 +62,8 @@
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
                 "/persist/.snapshots" = { };
-                "/persist/home/${config.sysusers.main}" = { };
-                "/persist/home/${config.sysusers.main}/.snapshots" = { };
+                "/persist/home" = { };
+                "/persist/home/.snapshots" = { };
               };
             };
           };
diff --git a/hosts/kitty/users/corn/default.nix b/hosts/kitty/users/corn/default.nix
index 20ca5f2e..446e0bde 100644
--- a/hosts/kitty/users/corn/default.nix
+++ b/hosts/kitty/users/corn/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   users.users."corn" = {
     isNormalUser = true;
diff --git a/hosts/pear/disko/default.nix b/hosts/pear/disko/default.nix
index cd0a3a89..8c7a5613 100644
--- a/hosts/pear/disko/default.nix
+++ b/hosts/pear/disko/default.nix
@@ -67,9 +67,9 @@
 	          mountpoint = "/persist";
 	          mountOptions = [ "compress=zstd" "noatime" "ssd" ];
 	        };
-	        "/persist/.snapshots" = { };
-	        "/persist/home/${config.sysusers.main}" = { };
-	        "/persist/home/${config.sysusers.main}/.snapshots" = { };
+                "/persist/.snapshots" = { };
+                "/persist/home" = { };
+                "/persist/home/.snapshots" = { };
               };
             };
           };
diff --git a/hosts/prophet/disko/default.nix b/hosts/prophet/disko/default.nix
index 32233d61..66c8b73c 100644
--- a/hosts/prophet/disko/default.nix
+++ b/hosts/prophet/disko/default.nix
@@ -62,8 +62,8 @@
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
                 "/persist/.snapshots" = { };
-                "/persist/home/${config.sysusers.main}" = { };
-                "/persist/home/${config.sysusers.main}/.snapshots" = { };
+                "/persist/home" = { };
+                "/persist/home/.snapshots" = { };
               };
             };
           };
diff --git a/hosts/redmond/disko/default.nix b/hosts/redmond/disko/default.nix
index dd1a1ff0..db24d325 100644
--- a/hosts/redmond/disko/default.nix
+++ b/hosts/redmond/disko/default.nix
@@ -67,9 +67,9 @@
 	          mountpoint = "/persist";
 	          mountOptions = [ "compress=zstd" "noatime" ];
 	        };
-	        "/persist/.snapshots" = { };
-	        "/persist/home/${config.sysusers.main}" = { };
-	        "/persist/home/${config.sysusers.main}/.snapshots" = { };
+                "/persist/.snapshots" = { };
+                "/persist/home" = { };
+                "/persist/home/.snapshots" = { };
               };
             };
           };