hyprland: move env vars to uwsm
This commit is contained in:
		| @@ -6,9 +6,38 @@ | |||||||
| }: | }: | ||||||
| let | let | ||||||
|   inherit (lib) |   inherit (lib) | ||||||
|  |     attrValues | ||||||
|  |     concatStringsSep | ||||||
|     elem |     elem | ||||||
|     optionals |     mapAttrs | ||||||
|  |     mkIf | ||||||
|     ; |     ; | ||||||
|  |   concatMapAttrsStringSep = | ||||||
|  |     sep: f: attrs: | ||||||
|  |     concatStringsSep sep (attrValues (mapAttrs f attrs)); | ||||||
|  |   globalVariables = | ||||||
|  |     { | ||||||
|  |       _JAVA_AWT_WM_NONREPARENTING = "1"; | ||||||
|  |       GDK_BACKEND = "wayland"; | ||||||
|  |       MOZ_ENABLE_WAYLAND = "1"; | ||||||
|  |       NIXOS_OZONE_WL = "1"; | ||||||
|  |       QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; | ||||||
|  |       QT_QPA_PLATFORM = "wayland"; | ||||||
|  |       SDL_VIDEODRIVE = "wayland"; | ||||||
|  |       XDG_SESSION_TYPE = "wayland"; | ||||||
|  |     } | ||||||
|  |     // ( | ||||||
|  |       if elem "nvidia" osConfig.services.xserver.videoDrivers then | ||||||
|  |         { | ||||||
|  |           GBM_BACKEND = "nvidia-drm"; | ||||||
|  |           LIBVA_DRIVER_NAME = "nvidia"; | ||||||
|  |         } | ||||||
|  |       else | ||||||
|  |         { } | ||||||
|  |     ); | ||||||
|  |   hyprVariables = { | ||||||
|  |     AQ_DRM_DEVICES = "/dev/dri/card0:/dev/dri/card1"; | ||||||
|  |   }; | ||||||
| in | in | ||||||
| { | { | ||||||
|   imports = [ |   imports = [ | ||||||
| @@ -22,26 +51,19 @@ in | |||||||
|     "SF Pro Text" |     "SF Pro Text" | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|  |   xdg.configFile = mkIf osConfig.programs.hyprland.withUWSM { | ||||||
|  |     "uwsm/env".text = concatMapAttrsStringSep "\n" ( | ||||||
|  |       name: value: "export ${name}=${value}" | ||||||
|  |     ) globalVariables; | ||||||
|  |     "uwsm/env-hyprland".text = concatMapAttrsStringSep "\n" ( | ||||||
|  |       name: value: "export ${name}=${value}" | ||||||
|  |     ) hyprVariables; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|   wayland.windowManager.hyprland = { |   wayland.windowManager.hyprland = { | ||||||
|     enable = true; |     enable = true; | ||||||
|     # plugins = [ hypr-dynamic-cursors ]; # https://github.com/VirtCode/hypr-dynamic-cursors |     # plugins = [ hypr-dynamic-cursors ]; # https://github.com/VirtCode/hypr-dynamic-cursors | ||||||
|     settings = { |     settings = { | ||||||
|       env = |  | ||||||
|         optionals (elem "nvidia" osConfig.services.xserver.videoDrivers) [ |  | ||||||
|           "GBM_BACKEND,nvidia-drm" |  | ||||||
|           "LIBVA_DRIVER_NAME,nvidia" |  | ||||||
|         ] |  | ||||||
|         ++ [ |  | ||||||
|           "_JAVA_AWT_WM_NONREPARENTING,1" |  | ||||||
|           "GDK_BACKEND,wayland" |  | ||||||
|           "MOZ_ENABLE_WAYLAND,1" |  | ||||||
|           "NIXOS_OZONE_WL,1" |  | ||||||
|           "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" |  | ||||||
|           "QT_QPA_PLATFORM,wayland" |  | ||||||
|           "SDL_VIDEODRIVER,wayland" |  | ||||||
|           "XDG_SESSION_TYPE,wayland" |  | ||||||
|         ]; |  | ||||||
|  |  | ||||||
|       general = { |       general = { | ||||||
|         gaps_in = 5; |         gaps_in = 5; | ||||||
|         gaps_out = 20; |         gaps_out = 20; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user