Revert "river: usar rivertile en vez de stacktile"

This reverts commit 1622083260.

.config/fontconfig/fonts.conf

@@ -82,10 +82,10 @@
 	<!-- Set default monospace font -->
 	<alias>
 		<family>monospace</family>
-		<prefer><family>Fantasque Sans Mono</family></prefer>
+		<prefer><family>IBM Plex Mono</family></prefer>
 	</alias>
 	<alias>
-		<family>Fantasque Sans Mono</family>
+		<family>IBM Plex Mono</family>
 		<default><family>monospace</family></default>
 	</alias>
 

.config/kak/kakrc

@@ -85,3 +85,30 @@ define-command sleuth -docstring 'Heuristically set buffer options' %{
 
 hook -group sleuth global BufOpenFile .* %{ sleuth }
 hook -group sleuth global BufWritePost .* %{ sleuth }
+
+# ------------
+# FZF
+# ------------
+source "%val{config}/plugins/fzf.kak/rc/fzf.kak"
+evaluate-commands %sh{
+    find -L "$kak_config/plugins/fzf.kak/rc/modules/" -type f -name '*.kak' -exec printf 'source "%s"\n' {} \;
+}
+map global user f ': fzf-mode<ret>f'
+
+# ------------
+# Buffer switching
+# ------------
+source "%val{config}/plugins/kakoune-buffers/buffers.kak"
+
+hook global WinDisplay .* info-buffers
+
+map global normal ^ q
+map global normal <a-^> Q
+
+map global normal q b
+map global normal Q B
+map global normal <a-q> <a-b>
+map global normal <a-Q> <a-B>
+
+map global normal b ':enter-buffers-mode<ret>'              -docstring 'buffers…'
+map global normal B ':enter-user-mode -lock buffers<ret>'   -docstring 'buffers (lock)…'

.config/kak/plugins/fzf.kak

@@ -0,0 +1 @@
+Subproject commit 68f21eb78638e5a55027f11aa6cbbaebef90c6fb

.config/kak/plugins/kakoune-buffers

@@ -0,0 +1 @@
+Subproject commit 6b2081f5b7d58c72de319a5cba7bf628b6802881

.config/river/init

@@ -32,5 +32,5 @@ riverctl float-filter-add title "Firefox — Sharing Indicator"
 
 ~/.config/river/keys
 
-riverctl spawn "pgrep -x rivertile >/dev/null || rivertile -view-padding 0 -outer-padding 0"
+riverctl spawn "pgrep -x stacktile >/dev/null || stacktile --per-tag-config --drop-empty-configs --outer-padding=0 --inner-padding=6 --primary-sublayout=stack"
-riverctl default-layout rivertile
+riverctl default-layout stacktile

.config/river/keys

@@ -24,10 +24,10 @@ riverctl map normal None Super_L spawn "killall -SIGUSR1 river-tag-overlay"
 
 riverctl map normal $mod Return zoom
 
-riverctl map normal $mod H send-layout-cmd rivertile "main-ratio -0.05"
+riverctl map normal $mod H send-layout-cmd stacktile "primary_ratio -0.05"
-riverctl map normal $mod L send-layout-cmd rivertile "main-ratio +0.05"
+riverctl map normal $mod L send-layout-cmd stacktile "primary_ratio +0.05"
-riverctl map normal $mod+Shift H send-layout-cmd rivertile "main-count +1"
+riverctl map normal $mod+Shift H send-layout-cmd stacktile "primary_count +1"
-riverctl map normal $mod+Shift L send-layout-cmd rivertile "main-count -1"
+riverctl map normal $mod+Shift L send-layout-cmd stacktile "primary_count -1"
 
 riverctl declare-mode move-resize
 riverctl map normal $mod R enter-mode move-resize
@@ -78,10 +78,11 @@ riverctl map normal $mod+Shift 0 set-view-tags $all_tags
 riverctl map normal $mod Space toggle-float
 riverctl map normal $mod F toggle-fullscreen
 
-riverctl map normal $mod Up    send-layout-cmd rivertile "main-location top"
+riverctl map normal $mod Up    send-layout-cmd stacktile "primary_position top"
-riverctl map normal $mod Right send-layout-cmd rivertile "main-location right"
+riverctl map normal $mod Right send-layout-cmd stacktile "primary_position right"
-riverctl map normal $mod Down  send-layout-cmd rivertile "main-location bottom"
+riverctl map normal $mod Down  send-layout-cmd stacktile "primary_position bottom"
-riverctl map normal $mod Left  send-layout-cmd rivertile "main-location left"
+riverctl map normal $mod Left  send-layout-cmd stacktile "primary_position left"
+riverctl map normal $mod M     send-layout-cmd stacktile "all_primary toggle"
 
 riverctl declare-mode passthrough
 riverctl map normal $mod F11 enter-mode passthrough

.config/themer/foot.ini.sh

@@ -11,11 +11,11 @@ lines = 10000
 hide-when-typing=yes
 
 [main]
-font=monospace:size=12
+font=monospace:size=11
 line-height=18
-vertical-letter-offset=4
+vertical-letter-offset=2
 
-pad=10x10 center
+pad=4x4 center
 " > ~/.config/foot/foot.ini
 
 rose_pine () {

.config/themer/river-colors.sh

@@ -21,9 +21,6 @@ rose_pine () {
 	" >> ~/.config/river/colors
 }
 mono () {
-	if test "$dark" = false; then
-		bg="export bg=~/.config/river/boyfriends-ships2.png"
-	fi
 	echo "
 	export background=$background
 	export border_focused=$accent

.config/themer/themes/mono-light.sh

@@ -3,5 +3,5 @@ export background=ffffff
 export backgroundish=cccccc
 export foreground=000000
 export foregroundish=333333
-export accent=907aa9
+export accent=56949f
 export dark=false

.gitmodules

@@ -40,3 +40,9 @@
 [submodule ".config/kak/plugins/zig.kak"]
 	path = .config/kak/plugins/zig.kak
 	url = https://gitea.nulo.in/Nulo/zig.kak
+[submodule ".config/kak/plugins/fzf.kak"]
+	path = .config/kak/plugins/fzf.kak
+	url = https://github.com/andreyorst/fzf.kak
+[submodule ".config/kak/plugins/kakoune-buffers"]
+	path = .config/kak/plugins/kakoune-buffers
+	url = https://github.com/Delapouite/kakoune-buffers