Skip to content

Commit da8fd0b

Browse files
committed
fix(hyprland,sway,uwsm): gate NVIDIA VRR env var behind nvidia GPU option
__GL_VRR_ALLOWED only applies to the NVIDIA driver but was set unconditionally, making it dead config on any AMD/Intel-only host. Set it only when khanelinix.hardware.gpu.nvidia.enable is true.
1 parent 2538571 commit da8fd0b

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

modules/home/programs/graphical/wms/hyprland/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ in
118118
XDG_SESSION_TYPE = "wayland";
119119
_JAVA_AWT_WM_NONREPARENTING = "1";
120120
__GL_GSYNC_ALLOWED = "0";
121+
}
122+
// lib.optionalAttrs (osConfig.khanelinix.hardware.gpu.nvidia.enable or false) {
121123
__GL_VRR_ALLOWED = "0";
122124
}
123125
// mkIf cfg.enableDebug {

modules/home/programs/graphical/wms/sway/default.nix

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,22 @@ in
8484
wayvnc
8585
];
8686

87-
sessionVariables = lib.mkIf (!(osConfig.khanelinix.programs.graphical.wms.sway.withUWSM or false)) {
88-
CLUTTER_BACKEND = "wayland";
89-
MOZ_ENABLE_WAYLAND = "1";
90-
MOZ_USE_XINPUT2 = "1";
91-
# NOTE: causes gldriverquery crash on wayland
92-
# SDL_VIDEODRIVER = "wayland";
93-
WLR_DRM_NO_ATOMIC = "1";
94-
XDG_SESSION_TYPE = "wayland";
95-
_JAVA_AWT_WM_NONREPARENTING = "1";
96-
__GL_GSYNC_ALLOWED = "0";
97-
__GL_VRR_ALLOWED = "0";
98-
};
87+
sessionVariables = lib.mkIf (!(osConfig.khanelinix.programs.graphical.wms.sway.withUWSM or false)) (
88+
{
89+
CLUTTER_BACKEND = "wayland";
90+
MOZ_ENABLE_WAYLAND = "1";
91+
MOZ_USE_XINPUT2 = "1";
92+
# NOTE: causes gldriverquery crash on wayland
93+
# SDL_VIDEODRIVER = "wayland";
94+
WLR_DRM_NO_ATOMIC = "1";
95+
XDG_SESSION_TYPE = "wayland";
96+
_JAVA_AWT_WM_NONREPARENTING = "1";
97+
__GL_GSYNC_ALLOWED = "0";
98+
}
99+
// lib.optionalAttrs (osConfig.khanelinix.hardware.gpu.nvidia.enable or false) {
100+
__GL_VRR_ALLOWED = "0";
101+
}
102+
);
99103
};
100104

101105
khanelinix = {

modules/nixos/programs/graphical/addons/uwsm/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ in
2828
export XDG_SESSION_TYPE=wayland
2929
export _JAVA_AWT_WM_NONREPARENTING=1
3030
export __GL_GSYNC_ALLOWED=0
31-
export __GL_VRR_ALLOWED=0
31+
${lib.optionalString config.khanelinix.hardware.gpu.nvidia.enable "export __GL_VRR_ALLOWED=0"}
3232
'';
3333
# Debug variables (commented out by default)
3434
#export AQ_TRACE="1"

0 commit comments

Comments
 (0)