From 4b83c3f9c228be995aa66c92c9d889971fa8de78 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 14 Apr 2025 21:55:26 +0200
Subject: [PATCH] chore: move xdg portals to home-manager

---
 config/graphical/default.nix       | 23 +++++------------------
 config/users.nix                   |  2 +-
 hosts/kroma/default.nix            |  1 -
 users/myuser/graphical/default.nix | 20 ++++++++++++++++++++
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/config/graphical/default.nix b/config/graphical/default.nix
index 68511fb..56b6a9d 100644
--- a/config/graphical/default.nix
+++ b/config/graphical/default.nix
@@ -43,24 +43,11 @@ in
     # Required for gnome3 pinentry
     services.dbus.packages = [ pkgs.gcr ];
 
-    xdg.portal = {
-      enable = true;
-      xdgOpenUsePortal = true;
-      config.common = {
-        default = [
-          "gtk"
-          "hyprland"
-        ];
-        "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
-        "org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
-        "org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ];
-        "org.freedesktop.portal.FileChooser" = [ "xdg-desktop-portal-gtk" ];
-      };
-      extraPortals = [
-        pkgs.xdg-desktop-portal-hyprland
-        pkgs.xdg-desktop-portal-gtk
-      ];
-    };
+    # We actually use the home-manager module to add the actual portal config,
+    # but need this so relevant implementations are found
+    environment.pathsToLink = [
+      "/share/xdg-desktop-portal"
+    ];
 
     services.displayManager.enable = true;
     programs.uwsm = {
diff --git a/config/users.nix b/config/users.nix
index de872ee..78d5ed0 100644
--- a/config/users.nix
+++ b/config/users.nix
@@ -39,7 +39,7 @@
       gamemode = uidGid 972;
       plausible = uidGid 971;
       actual = uidGid 970;
-      flatpak = uidGid 969;
+      # flatpak = uidGid 969;
       unifi = uidGid 968;
       plugdev.gid = 967;
       tss = uidGid 966;
diff --git a/hosts/kroma/default.nix b/hosts/kroma/default.nix
index 9e3a12d..2df3790 100644
--- a/hosts/kroma/default.nix
+++ b/hosts/kroma/default.nix
@@ -91,7 +91,6 @@
   programs.nix-ld.enable = true;
   topology.self.icon = "devices.desktop";
 
-  services.flatpak.enable = true;
   hardware.nvidia-container-toolkit.enable = true;
   virtualisation.containers.enable = true;
   virtualisation.podman = {
diff --git a/users/myuser/graphical/default.nix b/users/myuser/graphical/default.nix
index 557d979..1ab8509 100644
--- a/users/myuser/graphical/default.nix
+++ b/users/myuser/graphical/default.nix
@@ -93,4 +93,24 @@
   };
 
   xdg.mimeApps.enable = true;
+
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    config.common = {
+      default = [
+        "gtk"
+        "hyprland"
+      ];
+      "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
+      "org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
+      "org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ];
+      "org.freedesktop.portal.FileChooser" = [ "xdg-desktop-portal-gtk" ];
+    };
+    extraPortals = [
+      # automatically added by hyprland module
+      #pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal-gtk
+    ];
+  };
 }