gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #308946 from eclairevoyant/revert-hyprland-envvars

Browse Source 
nixos/hyprland: revert setting environment variables globally
This commit is contained in:
Jörg Thalheim
2024-05-05 00:45:50 +02:00
committed by GitHub
parent 51ac096e2d 23bde0b9e3
commit 68f45f55ee
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/programs/wayland/hyprland.nix
View File

@@ -42,15 +42,6 @@ in
xwayland.enable = mkEnableOption ("XWayland") // { default = true; }; xwayland.enable = mkEnableOption ("XWayland") // { default = true; };
envVars.enable = mkEnableOption null // {
default = true;
example = false;
description = ''
Set environment variables for Hyprland to work properly.
Enabled by default.
'';
};
systemd.setPath.enable = mkEnableOption null // { systemd.setPath.enable = mkEnableOption null // {
default = true; default = true;
example = false; example = false;
@@ -83,15 +74,6 @@ in
configPackages = mkDefault [ cfg.finalPackage ]; configPackages = mkDefault [ cfg.finalPackage ];
}; };
environment.sessionVariables = mkIf cfg.envVars.enable {
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
GDK_BACKEND = "wayland,x11";
QT_QPA_PLATFORM = "wayland;xcb";
_JAVA_AWT_WM_NONREPARENTING = "1"; # Fix for Java applications on tiling window managers
};
systemd = mkIf cfg.systemd.setPath.enable { systemd = mkIf cfg.systemd.setPath.enable {
user.extraConfig = '' user.extraConfig = ''
DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/%u/bin:/run/wrappers/bin" DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/%u/bin:/run/wrappers/bin"