diff options
author | Ilan Joselevich <personal@ilanjoselevich.com> | 2023-08-12 14:55:29 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-12 14:55:29 +0300 |
commit | 2393e099a66eb0252ebcb38375b3aec52e36a78c (patch) | |
tree | b200f3d77335594789de97d343a78e1524539e92 /nixos/modules | |
parent | 7514c56c0305fc7631d2f2ec06e4e1ee3a7dbc1b (diff) | |
parent | 355ebe41fa0d2fe121a6b47308e3199d743d3d65 (diff) |
Merge pull request #247008 from fufexan/hyprland
Update hyprwm packages and nixos/hyprland
Diffstat (limited to 'nixos/modules')
-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 faeaa8973fa97..e0ee5b6bd2a45 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" ] + ) + ]; } |