hunner/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trying to sort out swap

Browse source
This commit is contained in:
Hunter Haugen 2025-04-21 14:45:42 -07:00
parent b084eda7c9
commit 341448fa5e
3 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
framework/framework/configuration.nix
View file

@ -31,7 +31,7 @@ in
options = [ "defaults" "size=4G" "mode=755" ]; options = [ "defaults" "size=4G" "mode=755" ];
}; };
"/persist" = { "/persist" = {
device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54"; device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
fsType = "btrfs"; fsType = "btrfs";
neededForBoot = true; neededForBoot = true;
}; };

4
framework/framework/disko-btrfs.nix
View file

@ -68,10 +68,6 @@
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" "space_cache=v2" ]; mountOptions = [ "compress=zstd" "noatime" "ssd" "space_cache=v2" ];
}; };
"/swap" = {
mountpoint = "/swap";
swap.swapfile.size = "70G";
};
}; };
}; };
}; };

22
framework/framework/hardware-configuration-tmpfs.nix
View file

@ -19,51 +19,45 @@
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/C86C-8A59"; { device = "/dev/disk/by-uuid/963D-7FF2";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54"; { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" ]; options = [ "subvol=home" ];
}; };
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/196ffcae-d171-482c-8b90-dda60c0d4f86"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/3e59f9f8-065f-4778-a08e-dc361fc8c3a5";
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54"; { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" ]; options = [ "subvol=nix" ];
}; };
fileSystems."/persist" = fileSystems."/persist" =
{ device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54"; { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=persist" ]; options = [ "subvol=persist" ];
}; };
fileSystems."/swap" =
{ device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
fsType = "btrfs";
options = [ "subvol=swap" ];
};
fileSystems."/var/lib" = fileSystems."/var/lib" =
{ device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54"; { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=var/lib" ]; options = [ "subvol=var/lib" ];
}; };
fileSystems."/var/log" = fileSystems."/var/log" =
{ device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54"; { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=var/log" ]; options = [ "subvol=var/log" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/0137a60e-9a7c-4682-9bb8-9c05f996b9af"; } [ { device = "/dev/disk/by-uuid/05e71820-86a3-44d2-86e5-14738b3283b4"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking