From 4d74f43d747572f7b960fcad0c3bafd6b541a19a Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sun, 14 May 2023 16:33:06 +0100
Subject: [PATCH] nixos/kelder: Improve boot and mounting

---
 nixos/boxes/kelder/default.nix | 9 +++++++--
 nixos/modules/tmproot.nix      | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/boxes/kelder/default.nix b/nixos/boxes/kelder/default.nix
index cc414cb..6562b9e 100644
--- a/nixos/boxes/kelder/default.nix
+++ b/nixos/boxes/kelder/default.nix
@@ -41,14 +41,19 @@
               fsType = "vfat";
             };
             "/nix" = {
-              device = "/dev/ssd/nix";
+              device = "/dev/disk/by-uuid/0aab0249-700f-4856-8e16-7be3695295f5";
               fsType = "ext4";
             };
             "/persist" = {
-              device = "/dev/ssd/persist";
+              device = "/dev/disk/by-uuid/8c01e6b5-bdbf-4e5c-a33b-8693959ebe8a";
               fsType = "ext4";
               neededForBoot = true;
             };
+
+            "/mnt/storage" = {
+              device = "/dev/disk/by-partuuid/58a2e2a8-0321-ed4e-9eed-0ac7f63acb26";
+              fsType = "ext4";
+            };
           };
 
           environment = {
diff --git a/nixos/modules/tmproot.nix b/nixos/modules/tmproot.nix
index a85dd9f..0aee137 100644
--- a/nixos/modules/tmproot.nix
+++ b/nixos/modules/tmproot.nix
@@ -389,6 +389,9 @@ in
       (mkIf config.services.hardware.bolt.enable {
         my.tmproot.persistence.config.directories = [ "/var/lib/boltd" ];
       })
+      (mkIf config.boot.plymouth.enable {
+        my.tmproot.persistence.config.files = [ "/var/lib/plymouth/boot-duration" ];
+      })
     ]))
   ]);