diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index a0e8674..527da0d 100644 --- a/home/hyprland/default.nix +++ b/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:${ - mkRegexList [ - "com.nextcloud.desktopclient.nextcloud" - "soffice" - "xdg-desktop-portal-gtk" - ] - }" + "float,initialClass:${floatReg}" "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%" diff --git a/home/sway/default.nix b/home/sway/default.nix index 4cbcecc..b2d437e 100644 --- a/home/sway/default.nix +++ b/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"; diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix index 93fa9b1..30133e1 100644 --- a/hosts/brontes/configuration.nix +++ b/hosts/brontes/configuration.nix @@ -29,14 +29,7 @@ }; #: }}} - xdg.portal = { - enable = true; - config.common.default = "*"; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - ]; - }; + xdg.portal.enable = true; services.displayManager.sddm.enable = true; diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix index 13ff0c9..046d4f6 100644 --- a/hosts/marr/configuration.nix +++ b/hosts/marr/configuration.nix @@ -123,21 +123,7 @@ services.dbus.enable = true; - xdg.portal = { - 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 ]; - }; + xdg.portal.enable = true; services.gvfs.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 6bf43b8..7ffe484 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -19,5 +19,6 @@ ./system/printing.nix ./system/audio.nix ./secrets.nix + ./portals.nix ]; } diff --git a/modules/portals.nix b/modules/portals.nix index 87a72b1..dff3930 100644 --- a/modules/portals.nix +++ b/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 ]; }; - }