diff options
author | Mihai Fufezan <fufexan@protonmail.com> | 2023-08-03 19:37:03 +0300 |
---|---|---|
committer | Mihai Fufezan <fufexan@protonmail.com> | 2023-08-08 20:32:53 +0300 |
commit | 50ad802e5197db89f304dcbc71395c7c1feca0a1 (patch) | |
tree | 03d278b688e6f8c225c3da2ee09d56dbe2127fe2 /nixos/modules/programs | |
parent | d2eddd374f530b1d49c9e12908bab31cfa9d091f (diff) | |
download | nixpkgs-50ad802e5197db89f304dcbc71395c7c1feca0a1.tar nixpkgs-50ad802e5197db89f304dcbc71395c7c1feca0a1.tar.gz nixpkgs-50ad802e5197db89f304dcbc71395c7c1feca0a1.tar.bz2 nixpkgs-50ad802e5197db89f304dcbc71395c7c1feca0a1.tar.lz nixpkgs-50ad802e5197db89f304dcbc71395c7c1feca0a1.tar.xz nixpkgs-50ad802e5197db89f304dcbc71395c7c1feca0a1.tar.zst nixpkgs-50ad802e5197db89f304dcbc71395c7c1feca0a1.zip |
nixos/hyprland: remove xwayland.hidpi
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r-- | nixos/modules/programs/hyprland.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/nixos/modules/programs/hyprland.nix b/nixos/modules/programs/hyprland.nix index faeaa8973fa..e0ee5b6bd2a 100644 --- a/nixos/modules/programs/hyprland.nix +++ b/nixos/modules/programs/hyprland.nix @@ -32,11 +32,10 @@ in readOnly = true; default = cfg.package.override { enableXWayland = cfg.xwayland.enable; - hidpiXWayland = cfg.xwayland.hidpi; - nvidiaPatches = cfg.nvidiaPatches; + enableNvidiaPatches = cfg.enableNvidiaPatches; }; defaultText = literalExpression - "`wayland.windowManager.hyprland.package` with applied configuration"; + "`programs.hyprland.package` with applied configuration"; description = mdDoc '' The Hyprland package after applying configuration. ''; @@ -44,17 +43,9 @@ in portalPackage = mkPackageOptionMD pkgs "xdg-desktop-portal-hyprland" { }; - xwayland = { - 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. - ''; - }; - }; + xwayland.enable = mkEnableOption (mdDoc "XWayland") // { default = true; }; - nvidiaPatches = mkEnableOption (mdDoc "patching wlroots for better Nvidia support"); + enableNvidiaPatches = mkEnableOption (mdDoc "patching wlroots for better Nvidia support"); }; config = mkIf cfg.enable { @@ -77,4 +68,15 @@ in 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" ] + ) + ]; } |