diff --git a/hosts/desktops/common/boot.nix b/hosts/desktops/common/boot.nix index 7dea1a2..558a21a 100644 --- a/hosts/desktops/common/boot.nix +++ b/hosts/desktops/common/boot.nix @@ -11,10 +11,10 @@ loader = { efi.efiSysMountPoint = "/boot/efi"; systemd-boot = { - sortKey = "a_nixos"; + sortKey = "aa"; netbootxyz = { enable = true; - sortKey = "z_netbootxyz"; + sortKey = "zz"; }; }; }; diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix index 2720ab7..2ec38ca 100644 --- a/hosts/desktops/rotterdam.nix +++ b/hosts/desktops/rotterdam.nix @@ -1,6 +1,11 @@ { inputs, config, pkgs, lib, ... }: -{ +let + qubesnsh = pkgs.writeTextFile { + name = "qubes.nsh"; + text = "HD1f65535a1:EFI\\qubes\\grubx64.efi"; + }; +in { imports = [ # Host-common imports ../common @@ -37,15 +42,24 @@ nix.nixPath = [ "nixos-config=${./rotterdam.nix}" ]; - # users.users.user.extraGroups = [ "corectrl" ]; - - boot.kernelParams = [ - "processor.max_cstate=1" # Fixes bug where ryzen cpus freeze when in highest C state - "clearcpuid=514" - ]; - - programs = { - # corectrl.enable = true; - steam.dedicatedServer.openFirewall = true; + boot = { + kernelParams = [ + "processor.max_cstate=1" # Fixes bug where ryzen cpus freeze when in highest C state + "clearcpuid=514" + ]; + loader.systemd-boot = { + extraFiles = { + "efi/edk2-shell/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi"; + "qubes.nsh" = qubesnsh; + }; + extraEntries."qubes.conf" = '' + title Qubes OS + efi /efi/edk2-shell/shell.efi + options -nointerrupt qubes.nsh + sort-key ab + ''; + }; }; + + programs.steam.dedicatedServer.openFirewall = true; }