From 8ce54a8197ac897b85ec2847086f945657edb1d2 Mon Sep 17 00:00:00 2001
From: "Gustavo \"Guz\" L de Mello" <contact@guz.one>
Date: Thu, 19 Mar 2026 15:41:18 -0300
Subject: [PATCH] refactor(impermanence,battleship-mk2): save /var/keys
 directory instead of individual files

---
 hosts/battleship-mk2/impermanence.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hosts/battleship-mk2/impermanence.nix b/hosts/battleship-mk2/impermanence.nix
index ad02100..7834cc7 100644
--- a/hosts/battleship-mk2/impermanence.nix
+++ b/hosts/battleship-mk2/impermanence.nix
@@ -16,6 +16,7 @@
       "/etc/NetworkManager/system-connections"
       "/etc/secureboot"
       "/var/db/sudo"
+      "/var/keys"
       "/var/log"
       "/var/lib/bluetooth"
       "/var/lib/nixos"
@@ -29,10 +30,6 @@
     ];
     files = [
       "/etc/machine-id"
-      {
-        file = "/var/keys/secret_file";
-        parentDirectory = {mode = "u=rwx,g=,o=";};
-      }
     ];
   };
 
@@ -41,7 +38,7 @@
     script = pkgs.writeShellScriptBin "rollback" ''
       mkdir -p /btrfs_tmp
 
-      mount -o subvol=/ /dev/mapper/enc /btrfs_tmp
+      mount -o subvol=/ /dev/mapper/cryptroot /btrfs_tmp
 
       if [[ -e /btrfs_tmp/root ]]; then
         mkdir -p /btrfs_tmp/old_roots