From 3ab9bec9231c882cff39dffad0c2a9512645abb0 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Sun, 19 May 2024 17:12:01 +1200
Subject: [PATCH] refactor(xdg.portal): move all xdg.portal options -> system

---
 inputs/home/modules/desktop/wayland/default.nix               | 1 -
 .../desktop/wayland/windowManager/hyprland/default.nix        | 4 ----
 inputs/home/modules/theme/gtk/default.nix                     | 2 --
 inputs/system/modules/base/video/default.nix                  | 2 +-
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/inputs/home/modules/desktop/wayland/default.nix b/inputs/home/modules/desktop/wayland/default.nix
index 049a9f5..6a4d2ba 100644
--- a/inputs/home/modules/desktop/wayland/default.nix
+++ b/inputs/home/modules/desktop/wayland/default.nix
@@ -23,7 +23,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    xdg.portal.enable = true;
     home.sessionVariables = {
       CLUTTER_BACKEND = "wayland";
       NIXOS_OZONE_WL = "1";
diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix
index b7be2e9..6de98c3 100644
--- a/inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix
+++ b/inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix
@@ -12,10 +12,6 @@ in
   ];
 
   config = lib.mkIf cfg.enable {
-    xdg.portal = {
-      extraPortals = [ inputs.xdg-portal-hyprland.packages.${pkgs.system}.default ];
-    };
-
     home.packages = [
       pkgs.hyprpicker
       hyprvolume
diff --git a/inputs/home/modules/theme/gtk/default.nix b/inputs/home/modules/theme/gtk/default.nix
index 36c6292..89e52ec 100644
--- a/inputs/home/modules/theme/gtk/default.nix
+++ b/inputs/home/modules/theme/gtk/default.nix
@@ -34,8 +34,6 @@ in
         "Net/IconThemeName" = gtk.iconTheme.name;
       };
     };
-
-    xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   });
 }
 
diff --git a/inputs/system/modules/base/video/default.nix b/inputs/system/modules/base/video/default.nix
index 36d529c..1f694b0 100644
--- a/inputs/system/modules/base/video/default.nix
+++ b/inputs/system/modules/base/video/default.nix
@@ -2,7 +2,6 @@
 
 let
   inherit (lib) mkIf;
-  inherit (builtins) elem;
   isx86Linux = pkgs: with pkgs.stdenv; hostPlatform.isLinux && hostPlatform.isx86;
   host = config.systemModules.host;
 in
@@ -18,6 +17,7 @@ in
     };
     xdg.portal = {
       enable = true;
+      xdgOpenUsePortal = true;
       extraPortals = [
         pkgs.xdg-desktop-portal-gtk
       ];