diff options
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index bef6cd2fb5a2..a5bc436be826 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -33,7 +33,7 @@ kernel=u-boot-rpi3.bin # Boot in 64-bit mode. - arm_control=0x200 + arm_64bit=1 # U-Boot used to need this to work, regardless of whether UART is actually used or not. # TODO: check when/if this can be removed. diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index a39bb55b38c4..23b4d8ffb137 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,12 +9,7 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services.display-manager.environment; - sddm = if config.services.xserver.desktopManager.lxqt.enable then - # TODO: Move lxqt to libsForQt515 - pkgs.libsForQt514.sddm - else - pkgs.libsForQt5.sddm - ; + sddm = pkgs.libsForQt5.sddm; xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh |