From 75e9f37e435ada96e3fa349bfc980fd0c63c1c29 Mon Sep 17 00:00:00 2001
From: reo101 <pavel.atanasov2001@gmail.com>
Date: Mon, 6 Mar 2023 18:29:53 +0200
Subject: [PATCH] feat(river): add more goodies

`xdg-desktop-portal-wlr`
`Super+F11` to screenshot
---
 .../nixos/x86_64-linux/homix/configs/river    | 24 ++++++++++++-------
 .../x86_64-linux/homix/configuration.nix      |  1 +
 .../nixos/x86_64-linux/homix/home/reo101.nix  |  1 +
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/machines/nixos/x86_64-linux/homix/configs/river b/machines/nixos/x86_64-linux/homix/configs/river
index 10382aa..13c6d0b 100644
--- a/machines/nixos/x86_64-linux/homix/configs/river
+++ b/machines/nixos/x86_64-linux/homix/configs/river
@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 
-# # Super+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
-# riverctl map normal Super Return spawn foot
+# Super+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
+riverctl map normal Super Return spawn foot
 
-# Super+Return to start an instance of wezterm
-riverctl map normal Super Return spawn wezterm
+# # Super+Return to start an instance of wezterm
+# riverctl map normal Super Return spawn wezterm
 
 # Super+Q to close the focused view
 riverctl map normal Super Q close
@@ -12,6 +12,9 @@ riverctl map normal Super Q close
 # Super+Shift+Q to exit river
 riverctl map normal Super+Shift Q exit
 
+# Super+F11 to screenshot
+riverctl map normal Super F11 spawn 'grim -g "$(slurp)" - | wl-copy'
+
 # export PATH="${HOME}/.local/bin:${PATH}"
 riverctl map normal Super D PATH="${HOME}/.local/bin:${PATH}" dmenu_run
 
@@ -153,11 +156,14 @@ riverctl csd-filter-add app-id "tapy"
 # River will send the process group of the init executable SIGTERM on exit.
 riverctl default-layout rivertile
 
-pipewire &
-wireplumber &
-
-waybar &
-
 riverctl float-filter-add "flameshot"
 
+riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"
+riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"
+
+pipewire &
+wireplumber &
+waybar &
+
 exec rivertile -view-padding 6 -outer-padding 6
+# exec dbus-update-activation-environment WAYLAND_DISPLAY
diff --git a/machines/nixos/x86_64-linux/homix/configuration.nix b/machines/nixos/x86_64-linux/homix/configuration.nix
index 19ae443..ae51803 100644
--- a/machines/nixos/x86_64-linux/homix/configuration.nix
+++ b/machines/nixos/x86_64-linux/homix/configuration.nix
@@ -143,6 +143,7 @@
   # Enable desktop portal
   xdg.portal.extraPortals = [
     pkgs.xdg-desktop-portal-gtk
+    pkgs.xdg-desktop-portal-wlr
   ];
 
   ## X11 specific
diff --git a/machines/nixos/x86_64-linux/homix/home/reo101.nix b/machines/nixos/x86_64-linux/homix/home/reo101.nix
index bc3122d..b7e1363 100644
--- a/machines/nixos/x86_64-linux/homix/home/reo101.nix
+++ b/machines/nixos/x86_64-linux/homix/home/reo101.nix
@@ -34,6 +34,7 @@
     wl-clipboard
     slurp # select regions from wayland
     grim # grap images from regions
+    playerctl # music control
 
     ## Terminals
     # wezterm