Unverified Commit 68f45f55 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

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

nixos/hyprland: revert setting environment variables globally
parents 51ac096e 23bde0b9

nixos/modules/programs/wayland/hyprland.nix

+0 −18
Original line number Diff line number Diff line
@@ -42,15 +42,6 @@ in 


    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 // {

      default = true;

      example = false;
@@ -83,15 +74,6 @@ in 
      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 {

      user.extraConfig = ''

        DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/%u/bin:/run/wrappers/bin"