koishi/nixos
1
0
Fork 0
Code Issues Pull requests Projects Activity

fix(gpu): add checks for session-specific options

Browse source
This commit is contained in:
514fpv 2024-02-19 12:55:23 +08:00
parent 7e4d1afb5c
commit f2de94be1b
Signed by: koishi
SSH key fingerprint: SHA256:axz0uIzzY+5W19i7QOUuiw5LSqhKfCBKPf3L4xFRxLw
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
global/gpu/default.nix
View file

@ -46,11 +46,14 @@ in {
optional (cfg.type == "nvidia") vulkan-validation-layers; optional (cfg.type == "nvidia") vulkan-validation-layers;
}; };
services.xserver.videoDrivers = services.xserver = mkIf cfg.session {
optional nvidia "nvidia" ++ videoDrivers =
optional (cfg.type == "amdgpu") "amdgpu"; optional nvidia "nvidia" ++
# inhibits default display manager optional (cfg.type == "amdgpu") "amdgpu";
services.xserver.displayManager.startx.enable = mkDefault true; # inhibits default display manager
displayManager.startx.enable = mkDefault true;
};
hardware.nvidia = mkIf nvidia { hardware.nvidia = mkIf nvidia {
modesetting.enable = true; modesetting.enable = true;

3
global/gpu/greetd.nix
View file

@ -3,7 +3,8 @@
, config , config
, ... }: with lib; let , ... }: with lib; let
cfg = config.global.gpu; cfg = config.global.gpu;
in mkIf (cfg.enable && cfg.session) { gui = with cfg; enable && session;
in mkIf gui {
programs.regreet = { programs.regreet = {
enable = mkDefault true; enable = mkDefault true;
cageArgs = [ "-s" "-d" "-m" "last" ]; cageArgs = [ "-s" "-d" "-m" "last" ];

3
global/gpu/plymouth.nix
View file

@ -3,7 +3,8 @@
, config , config
, ... }: with lib; let , ... }: with lib; let
cfg = config.global.gpu; cfg = config.global.gpu;
in mkIf cfg.enable { gui = with cfg; enable && session;
in mkIf gui {
boot = { boot = {
loader.timeout = mkDefault 0; loader.timeout = mkDefault 0;
consoleLogLevel = 0; consoleLogLevel = 0;