refactor(host/orion): improve fs layout

hosts/orion/os/fs.nix

@@ -1,4 +1,7 @@
-{ lib, ... }:
+{
+  lib ? (import <nixpkgs> { }).lib,
+  ...
+}:
 let
   root-disk = "/dev/nvme0n1";
   persist-dir = "/persist";
@@ -38,18 +41,13 @@ in
       content = {
         type = "gpt";
         partitions = {
-          esp =
+          esp = {
-            let
-              label = "NixOS-Boot";
-            in
-            {
             priority = 1;
             size = "512M";
             type = "EF00";
             content = {
               extraArgs = [
-                  "-n ${label}"
+                "-n 'NixOS-Boot'"
-                  "-F 32"
               ];
               type = "filesystem";
               format = "vfat";
@@ -60,11 +58,7 @@ in
               ];
             };
           };
-          root =
+          root = {
-            let
-              label = "NixOS-Primary";
-            in
-            {
             size = "100%";
             content = {
               type = "luks";
@@ -77,13 +71,10 @@ in
                 type = "btrfs";
                 extraArgs = [
                   "-f"
-                    "--label ${label}"
+                  "-L NixOS-Primary"
                 ];
-                  postCreateHook = ''
+                preUnmountHook = ''
-                    MOUNT="$(mktemp -d)"
+                  btrfs subvolume snapshot -r "root" "root-base"
-                    mount "/dev/disk/by-label/${label}" "$MOUNT" -o subvol=/
-                    trap 'umount $MOUNT; rm -rf $MOUNT' EXIT
-                    btrfs subvolume snapshot -r "$MOUNT/root" "$MOUNT/root-base"
                 '';
                 subvolumes = {
                   "/root" = {