From 3a15f90405685c1847b25385a67636f09c4dd542 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 16 Jan 2024 10:47:36 +0100 Subject: [PATCH 1/3] Machines/WinMax2: use systemd initrd --- machines/WinMax2/configuration.nix | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index fc39a34..5a350a4 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -6,18 +6,27 @@ { # Use grub boot loader - boot.loader = { - systemd-boot.enable = false; - grub = { - enable = true; - device = "nodev"; - efiSupport = true; - # No other OS on here :P - useOSProber = false; + boot = { + loader = { + systemd-boot.enable = false; + grub = { + enable = true; + device = "nodev"; + efiSupport = true; + # No other OS on here :P + useOSProber = false; + }; + efi = { + efiSysMountPoint = config.fileSystems."efi_boot_partition".mountPoint; + canTouchEfiVariables = true; + }; }; - efi.efiSysMountPoint = config.fileSystems."efi_boot_partition".mountPoint; + /* + I use luks, and the systemd initrd works better for this + Both for tpm unlocking (soon) and for plymouth + */ + initrd.systemd.enable = true; }; - boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "WinMax2"; # Define your hostname. networking.networkmanager.enable = true; # Enable networking From 92b2b131baf2925a7416e4bfef66599c09c919f4 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 16 Jan 2024 20:53:40 +0100 Subject: [PATCH 2/3] Machines/WinMax2: force enable steam's scaling --- machines/WinMax2/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index 5a350a4..f5e869b 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -69,6 +69,9 @@ # Enable CUPS to print documents. # services.printing.enable = true; + environment.sessionVariables = { + STEAM_FORCE_DESKTOPUI_SCALING = "1.75"; + }; # Enable sound. # sound.enable = true; From 9b5dfb9c20798ad02d7949fe53c446b9a4883453 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 16 Jan 2024 20:56:56 +0100 Subject: [PATCH 3/3] Machines/WinMax2: set up scaling for plymouth --- machines/WinMax2/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index f5e869b..65980d5 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -26,6 +26,9 @@ Both for tpm unlocking (soon) and for plymouth */ initrd.systemd.enable = true; + # Plymouth doesn't support fractional scaling :( + plymouth.extraConfig = "DeviceScale=2"; + }; networking.hostName = "WinMax2"; # Define your hostname.