diff --git a/capibara.nix b/capibara.nix index 0c5decd..e957223 100644 --- a/capibara.nix +++ b/capibara.nix @@ -23,21 +23,21 @@ in { options = [ "subvolid=5" "compress=zstd" ]; }; - "/persist" = { + "/mnt/persist" = { device = "/dev/mapper/root"; fsType = "btrfs"; options = [ "subvol=persist" "compress=zstd" ]; neededForBoot = true; }; - "/logs" = { + "/mnt/logs" = { device = "/dev/mapper/root"; fsType = "btrfs"; options = [ "subvol=logs" "compress=zstd" ]; neededForBoot = true; }; - "/data" = { + "/mnt/data" = { device = "/dev/mapper/root"; fsType = "btrfs"; options = [ "subvol=data" "compress=zstd" ]; diff --git a/home/nixos-common.nix b/home/nixos-common.nix index 1bf8aeb..f05789d 100644 --- a/home/nixos-common.nix +++ b/home/nixos-common.nix @@ -44,7 +44,7 @@ ]; home.persistence = { - "/data/${config.home.homeDirectory}" = { + "/mnt/data/${config.home.homeDirectory}" = { directories = [ "Audio" "Calendars" @@ -66,7 +66,7 @@ allowOther = true; }; - "/persist/${config.home.homeDirectory}" = { + "/mnt/persist/${config.home.homeDirectory}" = { directories = [ ".Slic3r" ".abook" diff --git a/nixos/common.nix b/nixos/common.nix index 98bb8a8..7f016b5 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -252,7 +252,7 @@ swapDevices = [{ device = "/swap/swapfile"; }]; environment.persistence = { - "/persist" = { + "/mnt/persist" = { directories = [ "/etc/NetworkManager/system-connections" "/etc/nixos" @@ -271,7 +271,7 @@ ]; }; - "/logs" = { directories = [ "/var/log" ]; }; + "/mnt/logs" = { directories = [ "/var/log" ]; }; }; # Open ports in the firewall. diff --git a/trantor.nix b/trantor.nix index 42c66d8..3531669 100644 --- a/trantor.nix +++ b/trantor.nix @@ -32,14 +32,14 @@ in { options = [ "subvolid=5" "compress=zstd" ]; }; - "/persist" = { + "/mnt/persist" = { device = "/dev/mapper/user"; fsType = "btrfs"; options = [ "subvol=persist" "compress=zstd" ]; neededForBoot = true; }; - "/data" = { + "/mnt/data" = { device = "/dev/mapper/user"; fsType = "btrfs"; options = [ "subvol=data" "compress=zstd" ]; @@ -52,7 +52,7 @@ in { options = [ "subvol=nix" "compress=zstd" ]; }; - "/logs" = { + "/mnt/logs" = { device = "/dev/mapper/system"; fsType = "btrfs"; options = [ "subvol=logs" "compress=zstd" ];