From 3741d5b763d08df3b907cbbdf0dcb1f21dfbcdce Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Mon, 18 Aug 2025 13:35:50 -0400 Subject: [PATCH] Update elara drive Signed-off-by: Nikolaos Karaolidis --- hosts/elara/default.nix | 2 +- hosts/elara/format.nix | 82 +++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix index c68710d..cdc7bf9 100644 --- a/hosts/elara/default.nix +++ b/hosts/elara/default.nix @@ -63,5 +63,5 @@ sas.build.private = true; environment.impermanence.device = - config.disko.devices.disk.usb.content.partitions.root.content.content.device; + config.disko.devices.disk.main.content.partitions.root.content.device; } diff --git a/hosts/elara/format.nix b/hosts/elara/format.nix index 3883cda..4c07e29 100644 --- a/hosts/elara/format.nix +++ b/hosts/elara/format.nix @@ -1,7 +1,7 @@ { disko.devices = { - disk.usb = { - device = "/dev/disk/by-id/ata-Samsung_SSD_990_EVO_1TB_S7GCNL0XA04998F"; + disk.main = { + device = "/dev/disk/by-id/scsi-3600224809f331210b85f07f3c5e9dacd"; type = "disk"; content = { type = "gpt"; @@ -34,50 +34,42 @@ name = "root"; size = "100%"; content = { - name = "usb"; - type = "luks"; - passwordFile = "/tmp/keyfile"; - settings = { - allowDiscards = true; - }; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = - let - mountOptions = [ - "compress=zstd:3" - "noatime" - "user_subvol_rm_allowed" - ]; - in - { - "@" = { - mountpoint = "/"; - inherit mountOptions; - }; - "@persist" = { - mountpoint = "/persist"; - inherit mountOptions; - }; - "@persist/user" = { - mountpoint = "/persist/user"; - inherit mountOptions; - }; - "@persist/state" = { - mountpoint = "/persist/state"; - inherit mountOptions; - }; - "@persist/cache" = { - mountpoint = "/persist/cache"; - inherit mountOptions; - }; - "@nix" = { - mountpoint = "/nix"; - inherit mountOptions; - }; + type = "btrfs"; + extraArgs = [ "-f" ]; + subvolumes = + let + mountOptions = [ + "compress=zstd:5" + "noatime" + "user_subvol_rm_allowed" + ]; + in + { + "@" = { + mountpoint = "/"; + inherit mountOptions; }; - }; + "@persist" = { + mountpoint = "/persist"; + inherit mountOptions; + }; + "@persist/user" = { + mountpoint = "/persist/user"; + inherit mountOptions; + }; + "@persist/state" = { + mountpoint = "/persist/state"; + inherit mountOptions; + }; + "@persist/cache" = { + mountpoint = "/persist/cache"; + inherit mountOptions; + }; + "@nix" = { + mountpoint = "/nix"; + inherit mountOptions; + }; + }; }; }; };