system/os: add hyprland portal to xdg-portal configuration

NotAShelf · Feb 18, 2024 · 285e8fa · 285e8fa
1 parent 7cd14d5
commit 285e8fa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/modules/core/common/system/os/display/default.nix b/modules/core/common/system/os/display/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./wayland
     ./xorg

diff --git a/modules/core/common/system/os/display/wayland/xdg-portals.nix b/modules/core/common/system/os/display/wayland/xdg-portals.nix
@@ -12,20 +12,24 @@ in {
     xdg.portal = {
       enable = true;
 
-      extraPortals = [
-        pkgs.xdg-desktop-portal-gtk
-      ];
+      extraPortals = [pkgs.xdg-desktop-portal-gtk];
 
       config = {
         common = let
           portal =
             if env.desktop == "Hyprland"
             then "hyprland"
-            else "wlr";
+            else if env.desktop == "sway"
+            then "wlr"
+            else "gtk"; # FIXME: does this actually implement what we need?
         in {
+          default = [
+            "hyprland"
+            "gtk"
+          ];
+
           # for flameshot to work
           # https://github.com/flameshot-org/flameshot/issues/3363#issuecomment-1753771427
-          default = "gtk";
           "org.freedesktop.impl.portal.Screencast" = "${portal}";
           "org.freedesktop.impl.portal.Screenshot" = "${portal}";
         };

diff --git a/modules/core/common/system/os/misc/xdg-portals.nix b/modules/core/common/system/os/misc/xdg-portals.nix
@@ -7,17 +7,11 @@
   inherit (lib) mkIf;
 in {
   config = mkIf sys.video.enable {
-    xdg.portal = {
-      config = {
-        common = {
-          default = [
-            "gtk"
-          ];
-
-          "org.freedesktop.impl.portal.Secret" = [
-            "gnome-keyring"
-          ];
-        };
+    xdg.portal.config = {
+      common = {
+        "org.freedesktop.impl.portal.Secret" = [
+          "gnome-keyring"
+        ];
       };
     };
   };