From a75180810ac4d7e42a772d1beebbcc6f85e30e32 Mon Sep 17 00:00:00 2001
From: Sunderland93 <samoilov.lex@gmail.com>
Date: Thu, 29 May 2025 15:39:16 +0400
Subject: [PATCH] Initial release for Sauropod

---
 debian/changelog                      |  7 +++++++
 etc/skel/.config/river/init           | 20 ++++++++++----------
 etc/skel/.config/river/keybindings.sh |  4 ++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fb116f..faf6e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tileos-settings-river (2.0.0~tileos) unstable; urgency=medium
+
+  * Switch to Wofi as launcher
+  * Adapt to the new rules system
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Thu, 29 May 2025 15:38:25 +0400
+
 tileos-settings-river (1.2.0~tileos) unstable; urgency=medium
 
   * Add mic-mute.sh script for toggling microphone on/off
diff --git a/etc/skel/.config/river/init b/etc/skel/.config/river/init
index 33029d2..dbee412 100755
--- a/etc/skel/.config/river/init
+++ b/etc/skel/.config/river/init
@@ -77,17 +77,17 @@ riverctl border-width 2
 # Window rules
 
 # Make all views with an app-id that starts with "floating_shell" start floating.
-riverctl float-filter-add app-id "floating_shell"
+riverctl rule-add -app-id "floating_shell" float
 # Set floating view for some apps
-riverctl float-filter-add app-id "engrampa"
-riverctl float-filter-add app-id "calamares"
-riverctl float-filter-add app-id "nwg-look"
-riverctl float-filter-add app-id "qt5ct"
-riverctl float-filter-add app-id "qt6ct"
-riverctl float-filter-add app-id "pavucontrol"
-riverctl float-filter-add app-id "wdisplays"
-riverctl float-filter-add title "Picture-in-Picture"
-riverctl float-filter-add title "Firefox — Sharing Indicator"
+riverctl rule-add -app-id "engrampa" float
+riverctl rule-add -app-id "calamares" float
+riverctl rule-add -app-id "nwg-look" float
+riverctl rule-add -app-id "qt5ct" float
+riverctl rule-add -app-id "qt6ct" float
+riverctl rule-add -app-id "pavucontrol" float
+riverctl rule-add -app-id "wdisplays" float
+riverctl rule-add -title "Picture-in-Picture" float
+riverctl rule-add -title "Firefox — Sharing Indicator" float
 
 # Set the default layout generator to be rivertile and start it.
 # River will send the process group of the init executable SIGTERM on exit.
diff --git a/etc/skel/.config/river/keybindings.sh b/etc/skel/.config/river/keybindings.sh
index 9d519e9..a15bc56 100755
--- a/etc/skel/.config/river/keybindings.sh
+++ b/etc/skel/.config/river/keybindings.sh
@@ -7,7 +7,7 @@ mod="Mod4"
 term="alacritty"
 
 # Application launcher
-launcher="eval rofi -show combi -combi-modi 'drun,run' -terminal $term -ssh-command '{terminal} {ssh-client} {host} [-p {port}]' -run-shell-command '{terminal} {cmd}'"
+launcher="eval wofi --show drun --allow-images --allow-markup --hide-scroll --no-actions -lines 10 -width 35 --term $term --prompt "Search""
 
 # Volume changing notify
 volume_bar="/usr/share/river/scripts/volume-notify.sh"
@@ -29,7 +29,7 @@ riverctl map normal "$mod" Print spawn "/usr/bin/river-grimshot save area - | sw
 # riverctl keyboard-layout -options "grp:caps_toggle" "us,ru"
 
 ## Action // Reload River Configuration // $mod+R ##
-riverctl map normal $mod R spawn $HOME/.config/river/init
+riverctl map normal $mod R spawn "$HOME"/.config/river/init
 
 ## Launch // Terminal // $mod+Return ##
 riverctl map normal $mod Return spawn $term