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 = {