chore: centralize portal and replace swappy with satty

home/hyprland/default.nix

@@ -79,15 +79,14 @@ lib.mkIf osConfig.programs.hyprland.enable {
       windowrulev2 =
         let
           mkRegexList = list: "^(${(lib.strings.concatStringsSep "|" list)})$";
+          floatReg = mkRegexList [
+            "com.nextcloud.desktopclient.nextcloud"
+            "soffice"
+            "xdg-desktop-portal-gtk"
+          ];
         in
         [
-          "float,initialClass:${
+          "float,initialClass:${floatReg}"
-            mkRegexList [
-              "com.nextcloud.desktopclient.nextcloud"
-              "soffice"
-              "xdg-desktop-portal-gtk"
-            ]
-          }"
           "bordercolor rgb(e50000) rgb(ff8d00) rgb(ffee00) rgb(028121) rgb(004cff) rgb(770088), fullscreen:1"
           "focusonactivate, title:${mkRegexList [ "Firefox" ]}"
           "workspace 2,initialClass:${mkRegexList [ "firefox" ]}"
@@ -158,7 +157,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
           "$mod, F, fullscreen, 0"
           "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
           "$mod, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m region"
-          "$mod SHIFT, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot --raw -m region | ${pkgs.swappy}/bin/swappy -f -"
+          "$mod SHIFT, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
 
           #: Brightness and Media {{{
           ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%"

home/sway/default.nix

@@ -93,7 +93,7 @@
             "--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
             "Print" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
             "${mod}+u" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
-            "${mod}+Shift+u" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -";
+            "${mod}+Shift+u" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.satty}/bin/satty -f - --fullscreen";
 
             #: Workspace movement {{{
             "--input-device=${inputs.kb.builtin} ${mod}+ampersand" = "workspace number 1";

hosts/brontes/configuration.nix

@@ -29,14 +29,7 @@
   };
   #: }}}
 
-  xdg.portal = {
+  xdg.portal.enable = true;
-    enable = true;
-    config.common.default = "*";
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gtk
-      xdg-desktop-portal-hyprland
-    ];
-  };
 
   services.displayManager.sddm.enable = true;
 

hosts/marr/configuration.nix

@@ -123,21 +123,7 @@
 
   services.dbus.enable = true;
 
-  xdg.portal = {
+  xdg.portal.enable = true;
-    enable = true;
-    wlr = {
-      settings = {
-        screencast = {
-          chooser_type = "simple";
-          chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
-        };
-      };
-      enable = true;
-    };
-    config.common.default = "*";
-    # gtk portal needed to make gtk apps happy
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-  };
 
   services.gvfs.enable = true;
 

modules/default.nix

@@ -19,5 +19,6 @@
     ./system/printing.nix
     ./system/audio.nix
     ./secrets.nix
+    ./portals.nix
   ];
 }

modules/portals.nix

@@ -4,11 +4,11 @@
   pkgs,
   ...
 }:
-lib.mkIf config.xdg.portal.enabme {
+lib.mkIf config.xdg.portal.enable {
   xdg.portal = {
     config = {
       sway = {
-        "org.freedesktop.impl.portal.Screenshot.PickColor" = [ "hyprpicker" ];
+        "org.freedesktop.impl.portal.Screenshot.PickColor" = [ "${pkgs.hyprpicker}/bin/hyprpicker" ];
       };
       common.default = "*";
     };
@@ -19,5 +19,4 @@ lib.mkIf config.xdg.portal.enabme {
       xdg-desktop-portal-hyprland
     ];
   };
-
 }