diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/bootloader.nix | 72 | ||||
| -rw-r--r-- | nixos/services/pipewire.service.nix | 2 |
2 files changed, 65 insertions, 9 deletions
diff --git a/nixos/bootloader.nix b/nixos/bootloader.nix index ef40bf5..061791d 100644 --- a/nixos/bootloader.nix +++ b/nixos/bootloader.nix @@ -72,18 +72,74 @@ in { device = "nodev"; fsIdentifier = "label"; devices = ["nodev"]; + extraConfig = '' + function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi + }''; extraEntries = '' - menuentry "UEFI Firmware Settings" { - fwsetup + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Arch Linux' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-996df93f-0794-450a-9315-38f188e85878' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_gpt + insmod fat + search --no-floppy --fs-uuid --set=root 2E4F-3060 + echo 'Loading Linux linux ...' + linux /vmlinuz-linux root=UUID=996df93f-0794-450a-9315-38f188e85878 rw loglevel=3 quiet + echo 'Loading initial ramdisk ...' + initrd /amd-ucode.img /initramfs-linux.img } - menuentry "Reboot" { - reboot - } - menuentry "Poweroff" { - halt + submenu 'Advanced options for Arch Linux' $menuentry_id_option 'gnulinux-advanced-996df93f-0794-450a-9315-38f188e85878' { + menuentry 'Arch Linux, with Linux linux' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-linux-advanced-996df93f-0794-450a-9315-38f188e85878' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_gpt + insmod fat + search --no-floppy --fs-uuid --set=root 2E4F-3060 + echo 'Loading Linux linux ...' + linux /vmlinuz-linux root=UUID=996df93f-0794-450a-9315-38f188e85878 rw loglevel=3 quiet + echo 'Loading initial ramdisk ...' + initrd /amd-ucode.img /initramfs-linux.img + } + menuentry 'Arch Linux, with Linux linux (fallback initramfs)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-linux-fallback-996df93f-0794-450a-9315-38f188e85878' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_gpt + insmod fat + search --no-floppy --fs-uuid --set=root 2E4F-3060 + echo 'Loading Linux linux ...' + linux /vmlinuz-linux root=UUID=996df93f-0794-450a-9315-38f188e85878 rw loglevel=3 quiet + echo 'Loading initial ramdisk ...' + initrd /amd-ucode.img /initramfs-linux-fallback.img + } } + + ### END /etc/grub.d/10_linux ### + + menuentry "UEFI Firmware Settings" { + fwsetup + } + menuentry "Reboot" { + reboot + } + menuentry "Poweroff" { + halt + } ''; - useOSProber = true; + #useOSProber = true; configurationLimit = 10; fontSize = 32; theme = xenlism-grub-themes; diff --git a/nixos/services/pipewire.service.nix b/nixos/services/pipewire.service.nix index 8878903..03e82ef 100644 --- a/nixos/services/pipewire.service.nix +++ b/nixos/services/pipewire.service.nix @@ -50,6 +50,6 @@ in { } '') ]; - extraConfig.pipewire."99-input-denoising" = pw_rnnoise_config; + #extraConfig.pipewire."99-input-denoising" = pw_rnnoise_config; }; } |