diff --git a/hosts/kitty/boot/default.nix b/hosts/kitty/boot/default.nix
index 9c9d43a..5117fce 100644
--- a/hosts/kitty/boot/default.nix
+++ b/hosts/kitty/boot/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   boot = {
-    kernelPackages = pkgs.linuxPackages_5_10;
+    kernelPackages = pkgs.linuxPackages_5_15;
     swraid = {
       enable = true;
       mdadmConf = "MAILADDR contact@nixfox.ca";
diff --git a/hosts/redmond/boot/default.nix b/hosts/redmond/boot/default.nix
index b23818a..8be768d 100644
--- a/hosts/redmond/boot/default.nix
+++ b/hosts/redmond/boot/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/hosts/redmond/disko/default.nix b/hosts/redmond/disko/default.nix
index b96ab51..dd1a1ff 100644
--- a/hosts/redmond/disko/default.nix
+++ b/hosts/redmond/disko/default.nix
@@ -62,18 +62,14 @@
                   mountOptions = [ "compress=zstd" "noatime" ];
                 };
 
-                # Impermanence
-                "/persist" = {
-                  mountpoint = "/persist";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                };
-                "/persist/.snapshots" = { };
-
-                "/${config.sysusers.main}" = {
-                  mountpoint = "/persist/home/${config.sysusers.main}";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                };
-                "/${config.sysusers.main}/.snapshots" = { };
+	        # Impermanence
+	        "/persist" = {
+	          mountpoint = "/persist";
+	          mountOptions = [ "compress=zstd" "noatime" ];
+	        };
+	        "/persist/.snapshots" = { };
+	        "/persist/home/${config.sysusers.main}" = { };
+	        "/persist/home/${config.sysusers.main}/.snapshots" = { };
               };
             };
           };
@@ -90,8 +86,5 @@
   };
 
   # Needed for impermanence
-  fileSystems = {
-    "/persist".neededForBoot = true;
-    "/persist/home/${config.sysusers.main}".neededForBoot = true;
-  };
+  fileSystems."/persist".neededForBoot = true;
 }
diff --git a/modules/home/settings/xdg/folders/default.nix b/modules/home/settings/xdg/folders/default.nix
index 6a08592..37f3c97 100644
--- a/modules/home/settings/xdg/folders/default.nix
+++ b/modules/home/settings/xdg/folders/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   xdg.userDirs = {
-    enable = true;
+    enable = config.home.desktop.enable;
     createDirectories = true;
     desktop = null;
     music = null;