5 files changed, 18 insertions, 10 deletions
diff --git a/system/desktops/default.nix b/system/desktops/default.nix
index 8f9270f..476dd72 100644
--- a/system/desktops/default.nix
+++ b/system/desktops/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   imports = [
     ./hyprland.nix
     ./ly.nix
diff --git a/system/desktops/hyprland.nix b/system/desktops/hyprland.nix
index 42a45be..b0281a3 100644
--- a/system/desktops/hyprland.nix
+++ b/system/desktops/hyprland.nix
@@ -1,12 +1,11 @@
 {
   inputs,
   config,
-  pkgs,
   lib,
   system,
   ...
 }: let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;
   cfg = config.desktops.hyprland;
 in {
   config = mkIf cfg.enable {
@@ -17,14 +16,18 @@ in {
         inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland
       ];
       config.hyprland = {
-        default = ["hyprland" "gtk"];
+        default = lib.mkForce ["gtk"];
+        "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
         "org.freedesktop.impl.portal.FileChooser" = ["gtk"];
         "org.freedesktop.impl.portal.OpenURI" = ["gtk"];
+        "org.freedesktop.impl.portal.Screencast" = ["hyprland"];
+        "org.freedesktop.impl.portal.Screenshot" = ["hyprland"];
       };
     };
 
     programs.hyprland = {
       enable = true;
+      withUWSM = true;
       package = inputs.hyprland.packages.${system}.hyprland;
       portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
     };
diff --git a/system/desktops/ly.nix b/system/desktops/ly.nix
index 49469b2..298fc4c 100644
--- a/system/desktops/ly.nix
+++ b/system/desktops/ly.nix
@@ -1,9 +1,6 @@
 {
   lib,
   config,
-  pkgs,
-  inputs,
-  system,
   ...
 }: let
   inherit (lib) mkIf;
diff --git a/system/desktops/sway.nix b/system/desktops/sway.nix
index d0838a4..6c36c12 100644
--- a/system/desktops/sway.nix
+++ b/system/desktops/sway.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;
   cfg = config.desktops.sway;
 in {
   config = mkIf cfg.enable {
@@ -17,7 +17,10 @@ in {
         xdg-desktop-portal-wlr
       ];
       config.sway = {
-        default = lib.mkForce ["gtk" "wlr"];
+        default = lib.mkForce ["gtk"];
+        "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+        "org.freedesktop.impl.portal.FileChooser" = ["gtk"];
+        "org.freedesktop.impl.portal.OpenURI" = ["gtk"];
         "org.freedesktop.impl.portal.Screenshot" = ["wlr"];
         "org.freedesktop.impl.portal.ScreenCast" = ["wlr"];
       };
@@ -30,6 +33,7 @@ in {
         base = false;
         gtk = false;
       };
+      extraPackages = [];
     };
   };
 }
diff --git a/system/desktops/wayland.nix b/system/desktops/wayland.nix
index e11eca8..2f43fb3 100644
--- a/system/desktops/wayland.nix
+++ b/system/desktops/wayland.nix
@@ -10,12 +10,16 @@ in {
   config = mkIf cfg.enable {
     xdg.portal = {
       enable = true;
+      xdgOpenUsePortal = true;
       extraPortals = with pkgs; [
+        xdg-desktop-portal
         xdg-desktop-portal-gtk
       ];
       config.common = {
-        default = ["gtk"];
+        default = lib.mkForce ["gtk"];
         "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+        "org.freedesktop.impl.portal.FileChooser" = ["gtk"];
+        "org.freedesktop.impl.portal.OpenURI" = ["gtk"];
       };
     };