erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

desktop: Don't make SSH_AUTH_SOCK depend on cfg.wayland

Browse source
This commit is contained in:
Erwin Boskma 2023-07-05 10:09:01 +02:00
parent a4426075ff
commit a95ddcdb32
Signed by: erwin
SSH key fingerprint: SHA256:3F6Cm6I3erRqlBwEghZWAQl6eS5WrGTX1Vs/Evec1lQ
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
modules/desktop/default.nix
View file

@ -75,18 +75,23 @@ in
};
environment = {
sessionVariables = mkIf cfg.wayland {
_JAVA_AWT_WM_NONREPARENTING = "1";
MOZ_ENABLE_WAYLAND = "1";
MOZ_DBUS_REMOTE = "1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORMTHEME = "qt5ct";
SDL_VIDEODRIVER = "wayland";
SSH_AUTH_SOCK = ''''${XDG_RUNTIME_DIR}/keyring/ssh'';
AMD_VULKAN_ICD = "RADV";
NIXOS_OZONE_WL = "1";
};
sessionVariables = mkMerge [
{
SSH_AUTH_SOCK = ''''${XDG_RUNTIME_DIR}/keyring/ssh'';
}
(mkIf cfg.wayland
{
_JAVA_AWT_WM_NONREPARENTING = "1";
MOZ_ENABLE_WAYLAND = "1";
MOZ_DBUS_REMOTE = "1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORMTHEME = "qt5ct";
SDL_VIDEODRIVER = "wayland";
AMD_VULKAN_ICD = "RADV";
NIXOS_OZONE_WL = "1";
})
];
etc = {
"X11/xkb".source = "${pkgs.xkeyboard_config}/etc/X11/xkb";