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

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2023-12-04 09:43:43 -06:00
parent 0e450a7a7d bcbcacfab8
commit eb9bcceed0
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/foxtrot/default.nix
View file

@ -26,6 +26,7 @@
swapDevices = [ swapDevices = [
# TODO: move this to disko? # TODO: move this to disko?
# NOTE(oninstall):
# sudo btrfs subvolume create /swap # sudo btrfs subvolume create /swap
# sudo btrfs filesystem mkswapfile --size 32g --uuid clear /swap/swapfile # sudo btrfs filesystem mkswapfile --size 32g --uuid clear /swap/swapfile
# sudo swapon /swap/swapfile # sudo swapon /swap/swapfile
@ -33,7 +34,7 @@
]; ];
# findmnt -no UUID -T /swap/swapfile # findmnt -no UUID -T /swap/swapfile
boot.resumeDevice = "/dev/disk/by-uuid/3076912c-ac61-4067-b6b2-361f68b2d038"; boot.resumeDevice = "/dev/disk/by-uuid/81c3354a-f629-4b6b-a249-7705aeb9f0d5";
services.logind = { services.logind = {
lidSwitch = "suspend-then-hibernate"; lidSwitch = "suspend-then-hibernate";
@ -66,6 +67,7 @@
systemd-boot.enable = true; systemd-boot.enable = true;
}; };
# NOTE(oninstall):
# sudo filefrag -v /swap/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}' # sudo filefrag -v /swap/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}'
# the above won't work for btrfs, instead you need # the above won't work for btrfs, instead you need
# btrfs inspect-internal map-swapfile -r /swap/swapfile # btrfs inspect-internal map-swapfile -r /swap/swapfile
@ -74,7 +76,8 @@
kernelParams = [ kernelParams = [
"amdgpu.sg_display=0" "amdgpu.sg_display=0"
"acpi_osi=\"!Windows 2020\"" "acpi_osi=\"!Windows 2020\""
"resume_offset=39331072" # NOTE(oninstall):
"resume_offset=3421665"
# "nvme.noacpi=1" # maybe causing crashes upon waking? # "nvme.noacpi=1" # maybe causing crashes upon waking?
"rtc_cmos.use_acpi_alarm=1" "rtc_cmos.use_acpi_alarm=1"
]; ];