From 4df69d9d509fbc0b1255873c327ecdf07f31e890 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sat, 8 Feb 2025 22:24:03 -0500
Subject: [PATCH] fix(desktop): only use one version of
 xdg-desktop-portal-hyprland

---
 modules/desktop/environment/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/desktop/environment/default.nix b/modules/desktop/environment/default.nix
index 0fc485f0..d5e413af 100644
--- a/modules/desktop/environment/default.nix
+++ b/modules/desktop/environment/default.nix
@@ -42,11 +42,7 @@ in {
     programs.hyprland = {
       enable = true;
       package = hyprCfg.finalPackage;
-      portalPackage =
-        hyprland
-        .packages
-        .${pkgs.system}
-        .xdg-desktop-portal-hyprland;
+      portalPackage = hyprCfg.finalPortalPackage;
     };
 
     xdg.portal = {
@@ -69,6 +65,13 @@ in {
       };
     };
 
+    # Make sure we only use the package from the hyprland flake
+    nixpkgs.overlays = [
+      (final: prev: {
+        xdg-desktop-portal-hyprland = hyprCfg.finalPortalPackage;
+      })
+    ];
+
     home-manager.users.${cfg.user} = {
       imports = [
         ./home/dev.nix
@@ -92,6 +95,12 @@ in {
           '';
         });
 
+        portalPackage =
+          hyprland
+          .packages
+          .${pkgs.system}
+          .xdg-desktop-portal-hyprland;
+
         systemd.variables = ["-all"];
 
         settings = {