From 96e96fc42715e3fa9eca9b10f1ef9def3bc11d80 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@andyscott.me>
Date: Mon, 23 Oct 2023 05:54:11 -0400
Subject: [PATCH] Switched to river-git

---
 dot_config/river/executable_init.tmpl | 42 +++++++++++++--------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/dot_config/river/executable_init.tmpl b/dot_config/river/executable_init.tmpl
index e47e49b..1b797c3 100644
--- a/dot_config/river/executable_init.tmpl
+++ b/dot_config/river/executable_init.tmpl
@@ -69,18 +69,18 @@ riverctl map normal Super+Alt+Control F snap right
 riverctl map normal Super+Alt+Control P snap up
 riverctl map normal Super+Alt+Control N snap down
 
-# Move views
-riverctl map normal Super+Alt+Control+Shift B move left   100
-riverctl map normal Super+Alt+Control+Shift F move right  100
-riverctl map normal Super+Alt+Control+Shift P move up     100
-riverctl map normal Super+Alt+Control+Shift N move down   100
-
 # Resize views
 riverctl map normal Super+Alt+Shift B resize horizontal  -100
 riverctl map normal Super+Alt+Shift F resize horizontal   100
 riverctl map normal Super+Alt+Shift P resize vertical    -100
 riverctl map normal Super+Alt+Shift N resize vertical     100
 
+# Move views
+riverctl map normal Super+Alt+Control+Shift B move left   100
+riverctl map normal Super+Alt+Control+Shift F move right  100
+riverctl map normal Super+Alt+Control+Shift P move up     100
+riverctl map normal Super+Alt+Control+Shift N move down   100
+
 # Change layout
 riverctl map normal Super+Shift B send-layout-cmd rivertile "main-location left"
 riverctl map normal Super+Shift F send-layout-cmd rivertile "main-location right"
@@ -199,19 +199,19 @@ riverctl map-switch normal lid close 'waylock-launcher'
 riverctl focus-output DP-1
 {{- end }}
 
-### "rule-add" not until 0.3.0
-# Make all views with an app-id that starts with "float" and title "foo" start floating.
-# riverctl rule-add float -app-id 'Bitwarden'
-# riverctl rule-add float -app-id 'Blueman-manager'
-# riverctl rule-add float -app-id 'Galculator' -title 'galculator'
-# riverctl rule-add float -app-id 'KeePassXC'
-# riverctl rule-add float -app-id 'Lutris'
-# riverctl rule-add float -app-id 'Mousepad'
-# riverctl rule-add float -app-id 'Steam'
-# riverctl rule-add float -app-id 'vlc'
+# -app-id and title -"foo" start floating
+riverctl rule-add -app-id 'Bitwarden' float
+riverctl rule-add -app-id 'Blueman-manager' float
+rivercll rule-add -add-id 'connman-gtk' float
+riverctl rule-add -app-id 'galculator' float
+riverctl rule-add -app-id 'KeePassXC' float
+riverctl rule-add -app-id 'Lutris' float
+riverctl rule-add -app-id 'mousepad' float
+riverctl rule-add -app-id 'Steam' float
+riverctl rule-add -app-id 'vlc' float
 
-# Make all views with app-id "bar" and any title use client-side decorations
-# riverctl rule-add csd -app-id "bar"
+# -app-id "bar" and any title use client-side decorations
+riverctl rule-add -app-id 'emacs' csd
 
 # Default layout generator - rivertile(1)
 riverctl default-layout rivertile
@@ -220,10 +220,8 @@ rivertile -view-padding 4 -outer-padding 4 -main-ratio .55 &
 # Autostart
 dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river &
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-/usr/lib/at-spi-bus-launcher --launch-immediately &
-gnome-keyring-daemon --start --components=pkcs11 &
-gnome-keyring-daemon --start --components=secrets &
-gnome-keyring-daemon --start --components=ssh &
+#/usr/lib/at-spi-bus-launcher --launch-immediately &
+#gnome-keyring-daemon --start --components=pkcs11,secrets,ssh &
 kanshi &
 pipewire-launcher &
 swayidle-launcher &