koishi/nixos
1
0
Fork 0
Code Issues Pull requests Projects Activity

refactor(fs)!: extPersist -> external

Browse source
This commit is contained in:
514fpv 2024-01-21 20:43:50 +08:00
parent 6670a96ec2
commit ffa2202f50
Signed by: koishi
SSH key fingerprint: SHA256:axz0uIzzY+5W19i7QOUuiw5LSqhKfCBKPf3L4xFRxLw
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
global/fs/default.nix
View file

@ -32,7 +32,7 @@ in {
description = "vfat serial number of EFI system partition";
};
};
extPersist = {
external = {
enable = mkEnableOption "external persist filesystem";
# this wraps the standard fileSystems module
# since some attrs have to be unconditionally set
@ -73,8 +73,8 @@ in {
{ device = "/dev/disk/by-uuid/${cfg.esp.uuid}";
fsType = "vfat";
};
fileSystems."/nix/persist" = mkIf cfg.extPersist.enable
{ inherit (cfg.extPersist) device fsType options;
fileSystems."/nix/persist" = mkIf cfg.external.enable
{ inherit (cfg.external) device fsType options;
neededForBoot = true;
depends = [ "/nix" ];
};

8
spec/chireiden/default.nix
View file

@ -4,10 +4,10 @@
fs.esp.uuid = "32A5-6257";
fs.type = "xfs";
fs.store = "c0408dd5-dfc1-42e3-b925-2f32407d320a";
fs.extPersist.enable = true;
fs.extPersist.device = "/dev/disk/by-uuid/af2b8ec5-62d8-4b14-8ba8-083cc4fb33f4";
fs.extPersist.fsType = "btrfs";
fs.extPersist.options = [ "noatime" "compress=zstd" ];
fs.external.enable = true;
fs.external.device = "/dev/disk/by-uuid/af2b8ec5-62d8-4b14-8ba8-083cc4fb33f4";
fs.external.fsType = "btrfs";
fs.external.options = [ "noatime" "compress=zstd" ];
fs.cryptsetup.enable = true;
fs.cryptsetup.uuids.nix = "3905f87f-7b11-49ef-8ddf-f4202c555ffd";
fs.cryptsetup.uuids.persist = "b2322f01-1c44-433f-a995-4ddce5845cf9";

6
spec/koumakyou/default.nix
View file

@ -7,9 +7,9 @@
fs.esp.uuid = "B20E-5994";
fs.type = "xfs";
fs.store = "e8eea851-51b0-4c29-80c4-3d9358c4f3f8";
fs.extPersist.enable = true;
fs.extPersist.device = "/dev/disk/by-uuid/f0e13b58-1223-479c-b673-3a8e629c7f72";
fs.extPersist.fsType = "ext4";
fs.external.enable = true;
fs.external.device = "/dev/disk/by-uuid/f0e13b58-1223-479c-b673-3a8e629c7f72";
fs.external.fsType = "ext4";
fs.cryptsetup.enable = true;
fs.cryptsetup.uuids.nix = "84baa53a-c76d-4716-813a-196f5a53e44d";
fs.cryptsetup.uuids.persist = "e31f8b1c-6504-4b43-93dd-997ad17ebf5e";

8
spec/library/default.nix
View file

@ -9,10 +9,10 @@
fs.esp.uuid = "00A5-929C";
fs.type = "xfs";
fs.store = "25b9f83f-7f6d-432f-a169-2985e5930401";
fs.extPersist.enable = true;
fs.extPersist.device = "/dev/disk/by-uuid/ba3d0989-9f81-4ac0-b5a7-124c86835cfa";
fs.extPersist.fsType = "ext4";
fs.extPersist.options = [ "noatime" ];
fs.external.enable = true;
fs.external.device = "/dev/disk/by-uuid/ba3d0989-9f81-4ac0-b5a7-124c86835cfa";
fs.external.fsType = "ext4";
fs.external.options = [ "noatime" ];
oci.enable = true;
acme.enable = true;
};