From b9d57d2d583a50f1314b684856996e1558e7cbd0 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Tue, 24 Jun 2025 10:13:05 +0100
Subject: [PATCH] Clean up some XDG/UWSM details

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 hosts/common/configs/user/console/yazi/default.nix |  6 +++---
 hosts/common/configs/user/gui/feh/default.nix      | 12 ++++--------
 hosts/common/configs/user/gui/xdg/default.nix      |  5 +----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/hosts/common/configs/user/console/yazi/default.nix b/hosts/common/configs/user/console/yazi/default.nix
index 5a34cd5..01fc646 100644
--- a/hosts/common/configs/user/console/yazi/default.nix
+++ b/hosts/common/configs/user/console/yazi/default.nix
@@ -42,13 +42,13 @@ in
               };
             open = [
               {
-                run = "xdg-open \"$1\"";
+                run = "uwsm app -- xdg-open \"$1\"";
                 desc = "Open";
               }
             ];
             reveal = [
               {
-                run = "xdg-open \"$(dirname \"$1\")\"";
+                run = "uwsm app -- xdg-open \"$(dirname \"$1\")\"";
                 desc = "Reveal";
               }
             ];
@@ -60,7 +60,7 @@ in
             ];
             play = [
               {
-                run = "mpv \"$@\"";
+                run = "uwsm app -- mpv \"$@\"";
                 orphan = true;
               }
             ];
diff --git a/hosts/common/configs/user/gui/feh/default.nix b/hosts/common/configs/user/gui/feh/default.nix
index 1b4ca39..f60b5f6 100644
--- a/hosts/common/configs/user/gui/feh/default.nix
+++ b/hosts/common/configs/user/gui/feh/default.nix
@@ -35,21 +35,17 @@
       "image/pjpeg"
       "image/png"
       "image/tiff"
+      "image/webp"
       "image/x-bmp"
-      "image/x-gray"
-      "image/x-icb"
-      "image/x-ico"
+      "image/x-pcx"
       "image/x-png"
       "image/x-portable-anymap"
       "image/x-portable-bitmap"
       "image/x-portable-graymap"
       "image/x-portable-pixmap"
+      "image/x-tga"
       "image/x-xbitmap"
-      "image/x-xpixmap"
-      "image/x-pcx"
-      "image/svg+xml"
-      "image/svg+xml-compressed"
-      "image/vnd.wap.wbmp"
+      "image/heic"
     ] (_: "feh.desktop");
   };
 }
diff --git a/hosts/common/configs/user/gui/xdg/default.nix b/hosts/common/configs/user/gui/xdg/default.nix
index 98be87c..56aaa55 100644
--- a/hosts/common/configs/user/gui/xdg/default.nix
+++ b/hosts/common/configs/user/gui/xdg/default.nix
@@ -4,8 +4,5 @@
 }:
 { config, pkgs, ... }:
 {
-  home-manager.users.${user}.xdg.portal = {
-    xdgOpenUsePortal = true;
-    extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
-  };
+  home-manager.users.${user}.xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
 }