cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/hyprland: remove xwayland.hidpi

Browse source
This commit is contained in:
Mihai Fufezan 2023-08-03 19:37:03 +03:00
parent d2eddd374f
commit 50ad802e51
No known key found for this signature in database
GPG key ID: 5899325F2F120900
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nixos/modules/programs/hyprland.nix
View file

@ -32,11 +32,10 @@ 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.nvidiaPatches;
}; };
defaultText = literalExpression defaultText = literalExpression
"`wayland.windowManager.hyprland.package` with applied configuration"; "`programs.hyprland.package` with applied configuration";
description = mdDoc '' description = mdDoc ''
The Hyprland package after applying configuration. The Hyprland package after applying configuration.
''; '';
@ -44,17 +43,9 @@ in
portalPackage = mkPackageOptionMD pkgs "xdg-desktop-portal-hyprland" { }; portalPackage = mkPackageOptionMD pkgs "xdg-desktop-portal-hyprland" { };
xwayland = { xwayland.enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
hidpi = mkEnableOption null // {
description = mdDoc ''
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.
'';
};
};
nvidiaPatches = mkEnableOption (mdDoc "patching wlroots for better Nvidia support"); enableNvidiaPatches = mkEnableOption (mdDoc "patching wlroots for better Nvidia support");
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -77,4 +68,15 @@ in
extraPortals = [ finalPortalPackage ]; extraPortals = [ finalPortalPackage ];
}; };
}; };
imports = with lib; [
(mkRemovedOptionModule
[ "programs" "hyprland" "xwayland" "hidpi" ]
"XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland"
)
(mkRenamedOptionModule
[ "programs" "hyprland" "nvidiaPatches" ]
[ "programs" "hyprland" "enableNvidiaPatches" ]
)
];
} }