Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

hyprland: remove xwayland.hidpi (#4302)

Browse source 
Remove xwayland.hidpi option, since we're dropping HiDPI XWayland
patches support, opting to use the builtin xwayland:force_zero_scaling
option instead. It is described in more detail in
https://wiki.hyprland.org/ Configuring/XWayland.
This commit is contained in:
Mihai Fufezan 2023-08-14 10:40:09 +03:00 committed by GitHub
parent c3ab5ea047
commit 88067b9b14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/services/window-managers/hyprland.nix
View file

@ -11,12 +11,16 @@ in {
imports = [ imports = [
(lib.mkRemovedOptionModule # \ (lib.mkRemovedOptionModule # \
[ "wayland" "windowManager" "hyprland" "disableAutoreload" ] [ "wayland" "windowManager" "hyprland" "disableAutoreload" ]
"Autoreloading now always happen") "Autoreloading now always happens")
(lib.mkRemovedOptionModule # \ (lib.mkRemovedOptionModule # \
[ "wayland" "windowManager" "hyprland" "recommendedEnvironment" ] [ "wayland" "windowManager" "hyprland" "recommendedEnvironment" ]
"Recommended environment variables are now always set") "Recommended environment variables are now always set")
(lib.mkRemovedOptionModule # \
[ "wayland" "windowManager" "hyprland" "xwayland" "hidpi" ]
"HiDPI patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland")
(lib.mkRenamedOptionModule # \ (lib.mkRenamedOptionModule # \
[ "wayland" "windowManager" "hyprland" "nvidiaPatches" ] # \ [ "wayland" "windowManager" "hyprland" "nvidiaPatches" ] # \
[ "wayland" "windowManager" "hyprland" "enableNvidiaPatches" ]) [ "wayland" "windowManager" "hyprland" "enableNvidiaPatches" ])
@ -32,8 +36,7 @@ in {
readOnly = true; readOnly = true;
default = cfg.package.override { default = cfg.package.override {
enableXWayland = cfg.xwayland.enable; enableXWayland = cfg.xwayland.enable;
hidpiXWayland = cfg.xwayland.hidpi; enableNvidiaPatches = cfg.enableNvidiaPatches;
nvidiaPatches = cfg.enableNvidiaPatches;
}; };
defaultText = lib.literalMD defaultText = lib.literalMD
"`wayland.windowManager.hyprland.package` with applied configuration"; "`wayland.windowManager.hyprland.package` with applied configuration";
@ -66,15 +69,7 @@ in {
''; '';
}; };
xwayland = { xwayland.enable = lib.mkEnableOption "XWayland" // { default = true; };
enable = lib.mkEnableOption "XWayland" // { default = true; };
hidpi = lib.mkEnableOption null // {
description = ''
Enable HiDPI XWayland, based on [XWayland MR 733](https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/733).
See <https://wiki.hyprland.org/Nix/Options-Overrides/#xwayland-hidpi> for more info.
'';
};
};
enableNvidiaPatches = enableNvidiaPatches =
lib.mkEnableOption "patching wlroots for better Nvidia support"; lib.mkEnableOption "patching wlroots for better Nvidia support";