Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nit: factor out common options from hardware configurations

Browse source
This commit is contained in:
Infinidoge 2023-07-20 20:51:57 -04:00
parent 414f8b6030
commit 5022624bf1
3 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hosts/Infini-SERVER/hardware-configuration.nix
View file

@ -21,7 +21,7 @@ in
esp = uuid "A2B8-4C6E";
data = uuid "59abb0ff-fe4e-4061-87d2-b728b937656a";
btrfsOptions = [ "defaults" "autodefrag" "noatime" ];
commonOptions = [ "autodefrag" "noatime" "ssd" ];
in
{
"/" = {
@ -33,35 +33,35 @@ in
"/media/main" = {
device = main;
fsType = "btrfs";
options = [ "subvol=/" "ssd" ] ++ btrfsOptions;
options = [ "subvol=/" ] ++ commonOptions;
neededForBoot = true;
};
"/media/data" = lib.mkIf (data != null) {
device = data;
fsType = "btrfs";
options = [ "subvol=/" "ssd" ] ++ btrfsOptions;
options = [ "subvol=/" ] ++ commonOptions;
neededForBoot = true;
};
"/persist" = {
device = main;
fsType = "btrfs";
options = [ "subvol=root" "ssd" ] ++ btrfsOptions;
options = [ "subvol=root" ] ++ commonOptions;
neededForBoot = true;
};
"/etc/ssh" = {
device = main;
fsType = "btrfs";
options = [ "subvolid=264" "ssd" ] ++ btrfsOptions;
options = [ "subvolid=264" ] ++ commonOptions;
neededForBoot = true;
};
"/persist/srv" = lib.mkIf (data != null) {
device = data;
fsType = "btrfs";
options = [ "subvol=root/srv" "ssd" ] ++ btrfsOptions;
options = [ "subvol=root/srv" ] ++ commonOptions;
neededForBoot = true;
};
@ -80,14 +80,14 @@ in
"/nix" = {
device = main;
fsType = "btrfs";
options = [ "subvol=nix" "ssd" ] ++ btrfsOptions;
options = [ "subvol=nix" ] ++ commonOptions;
neededForBoot = true;
};
"/boot" = {
device = main;
fsType = "btrfs";
options = [ "subvol=boot" "ssd" ] ++ btrfsOptions;
options = [ "subvol=boot" ] ++ commonOptions;
neededForBoot = true;
};