From c21746540919e73a2481c6ddf8a7c4c19279fbb6 Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Tue, 27 Aug 2024 16:36:17 +0200
Subject: [PATCH] Fix changed partition names

---
 hosts/nixos/calypso/filesystems/default.nix    |  1 -
 hosts/nixos/calypso/filesystems/partitions.nix | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/hosts/nixos/calypso/filesystems/default.nix b/hosts/nixos/calypso/filesystems/default.nix
index acc5540..154d7ec 100644
--- a/hosts/nixos/calypso/filesystems/default.nix
+++ b/hosts/nixos/calypso/filesystems/default.nix
@@ -32,7 +32,6 @@
     after = [ "systemd-cryptsetup@enc.service" ];
     before = [ "sysroot.mount" ];
     script = ''
-      ls /
       btrfs subvolume delete /
       btrfs subvolume create /
     '';
diff --git a/hosts/nixos/calypso/filesystems/partitions.nix b/hosts/nixos/calypso/filesystems/partitions.nix
index 0657335..466049d 100644
--- a/hosts/nixos/calypso/filesystems/partitions.nix
+++ b/hosts/nixos/calypso/filesystems/partitions.nix
@@ -35,7 +35,7 @@
 
               subvolumes = {
                 # {{{ /
-                "root" = {
+                "/root" = {
                   mountpoint = "/";
                   mountOptions = [
                     "compress=zstd"
@@ -44,13 +44,13 @@
                 };
                 # }}}
                 # {{{ /swap
-                "swap" = {
+                "/swap" = {
                   mountpoint = "/.swapvol";
                   swap.swapfile.size = "20G";
                 };
                 # }}}
                 # {{{ /persist/data
-                "persist-data" = {
+                "/root/persist/data" = {
                   mountpoint = "/persist/data";
                   mountOptions = [
                     "compress=zstd"
@@ -59,7 +59,7 @@
                 };
                 # }}}
                 # {{{ /persist/state
-                "persist-state" = {
+                "/root/persist/state" = {
                   mountpoint = "/persist/state";
                   mountOptions = [
                     "compress=zstd"
@@ -68,7 +68,7 @@
                 };
                 # }}}
                 # {{{ /local/nix
-                "local-nix" = {
+                "/root/local/nix" = {
                   mountpoint = "/nix";
                   mountOptions = [
                     "compress=zstd"
@@ -76,8 +76,8 @@
                   ];
                 };
                 # }}}
-                # {{{ /local/nix
-                "local-cache" = {
+                # {{{ /local/cache
+                "/root/local/cache" = {
                   mountpoint = "/persist/local/cache";
                   mountOptions = [
                     "compress=zstd"