From 1ca52dc2aefa9e48ac068a7a5b417eea2bccc596 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 1 May 2024 10:21:28 -0400 Subject: [PATCH] refactor(hypr): remove need for portal override --- modules/hyprland/default.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 079e4f5..63a3ef4 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -33,23 +33,25 @@ in { programs.hyprland = with hyprland.packages.${pkgs.system}; { enable = true; - package = default.overrideAttrs (o: { - postFixup = '' - rm "$out/share/xdg-desktop-portal/hyprland-portals.conf" - - cat < "$out/share/xdg-desktop-portal/hyprland-portals.conf" - [preferred] - default=hyprland;gtk - org.freedesktop.impl.portal.FileChooser=kde - EOF - ''; - }); + package = default; portalPackage = xdg-desktop-portal-hyprland; }; - xdg.portal.extraPortals = [ - pkgs.xdg-desktop-portal-kde - ]; + xdg.portal = { + enable = true; + + extraPortals = with pkgs; [ + xdg-desktop-portal-kde + ]; + + config.hyprland = { + default = [ + "hyprland" + "gtk" + ]; + "org.freedesktop.impl.portal.FileChooser" = ["kde"]; + }; + }; # HOME-MANAGER CONFIG home-manager.users.${mainUser} = {