From 88067b9b148ed86f81d80d13e49f0f848dbd96e0 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Mon, 14 Aug 2023 10:40:09 +0300
Subject: [PATCH] hyprland: remove xwayland.hidpi (#4302)

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.
---
 modules/services/window-managers/hyprland.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix
index 41ceb356c..76141a64b 100644
--- a/modules/services/window-managers/hyprland.nix
+++ b/modules/services/window-managers/hyprland.nix
@@ -11,12 +11,16 @@ in {
   imports = [
     (lib.mkRemovedOptionModule # \
       [ "wayland" "windowManager" "hyprland" "disableAutoreload" ]
-      "Autoreloading now always happen")
+      "Autoreloading now always happens")
 
     (lib.mkRemovedOptionModule # \
       [ "wayland" "windowManager" "hyprland" "recommendedEnvironment" ]
       "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 # \
       [ "wayland" "windowManager" "hyprland" "nvidiaPatches" ] # \
       [ "wayland" "windowManager" "hyprland" "enableNvidiaPatches" ])
@@ -32,8 +36,7 @@ in {
       readOnly = true;
       default = cfg.package.override {
         enableXWayland = cfg.xwayland.enable;
-        hidpiXWayland = cfg.xwayland.hidpi;
-        nvidiaPatches = cfg.enableNvidiaPatches;
+        enableNvidiaPatches = cfg.enableNvidiaPatches;
       };
       defaultText = lib.literalMD
         "`wayland.windowManager.hyprland.package` with applied configuration";
@@ -66,15 +69,7 @@ in {
       '';
     };
 
-    xwayland = {
-      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.
-        '';
-      };
-    };
+    xwayland.enable = lib.mkEnableOption "XWayland" // { default = true; };
 
     enableNvidiaPatches =
       lib.mkEnableOption "patching wlroots for better Nvidia support";