From 0a551a210b3939cfcd84c6abac394c6bbc9ab97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukpank@o2.pl>
Date: Mon, 4 May 2026 20:57:38 +0200
Subject: [PATCH] kakoune: use kak-bundle

---
 kakoune/.config/kak/kakrc | 71 +++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc
index 23eed8b..3c96a03 100644
--- a/kakoune/.config/kak/kakrc
+++ b/kakoune/.config/kak/kakrc
@@ -65,42 +65,55 @@ map global object t '<a-semicolon>lsp-object Class Interface Module Namespace St
 map global object d '<a-semicolon>lsp-diagnostic-object error warning<ret>' -docstring 'LSP errors and warnings'
 map global object D '<a-semicolon>lsp-diagnostic-object error<ret>' -docstring 'LSP errors'
 
-# PLUGINS
+map global lsp p '<esc>: lsp-find-error --previous error<ret>'   -docstring 'find previous error'
 
-source "%val{config}/plugins/plug.kak/rc/plug.kak"
+# BUNDLE
 
-plug-chain "andreyorst/plug.kak" noload %{
-    # noload to avoid removing by plug-clean
-} plug "https://codeberg.org/raiguard/kak-one" theme config %{
-    # COLORSCHEME
-    colorscheme 'one-darker'
-} plug "andreyorst/fzf.kak" config %{
-    # FZF
+source "%val{config}/bundle/kak-bundle/rc/kak-bundle.kak"
+bundle-noload kak-bundle https://codeberg.org/jdugan6240/kak-bundle
+
+# COLORSCHEME
+
+bundle-theme kak-one "https://codeberg.org/raiguard/kak-one"
+colorscheme 'one-darker'
+
+bundle-theme kakoune-themes "https://codeberg.org/anhsirk0/kakoune-themes"
+
+# FZF
+
+bundle fzf.kak "https://github.com/andreyorst/fzf.kak" %{
     map global normal <c-p> ': fzf-mode<ret>'
-} plug "h-youhei/kakoune-surround" config %{
-    # SURROUND
-    declare-user-mode surround
-    map global surround s ': surround<ret>' -docstring 'surround'
-    map global surround c ': change-surround<ret>' -docstring 'change'
-    map global surround d ': delete-surround<ret>' -docstring 'delete'
-    map global surround t ': select-surrounding-tag<ret>' -docstring 'select tag'
-    map global -docstring 'Surround' user 'S' ': enter-user-mode surround<ret>'
-} plug "https://codeberg.org/raiguard/kak-harpoon" config %{
-    # HARPOON
-    harpoon-add-bindings
-} plug https://git.sr.ht/~voroskoi/easymotion.kak config %{
-    # EASYMOTION
-    require-module easymotion
-    map global -docstring 'easy j' user <j> ': easymotion-j<ret>'
-    map global -docstring 'easy k' user <k> ': easymotion-k<ret>'
-    map global -docstring 'easy w' user <w> ': easymotion-w<ret>'
-    map global -docstring 'easy b'user <b> ': easymotion-b<ret>'
 }
 
-# FZF recent
-
 hook global BufCreate [^*].* %{
     nop %sh{
         mru=~/.cache/kak-mru
             echo "$kak_buffile" | awk '!seen[$0]++' - "$mru" | sponge "$mru"
 }}
+
+# SURROUND
+
+bundle kakoune-surround "h-youhei/kakoune-surround" %{
+    declare-user-mode surround
+    map global surround s ': surround<ret>' -docstring 'surround'
+    map global surround c ': change-surround<ret>' -docstring 'change'
+    map global surround d ': delete-surround<ret>' -docstring 'delete'
+    map global surround t ': select-surrounding-tag<ret>' -docstring 'select tag'
+    map global -docstring 'Surround' user 'S' ': enter-user-mode surround<ret>'
+}
+
+# HARPOON
+
+bundle kak-harpoon "https://codeberg.org/raiguard/kak-harpoon" %{
+    harpoon-add-bindings
+}
+
+# EASYMOTION
+
+bundle easymotion.kak https://git.sr.ht/~voroskoi/easymotion.kak %{
+    require-module easymotion
+    map global -docstring 'easy j' user <j> ': easymotion-j<ret>'
+    map global -docstring 'easy k' user <k> ': easymotion-k<ret>'
+    map global -docstring 'easy w' user <w> ': easymotion-w<ret>'
+    map global -docstring 'easy b'user <b> ': easymotion-b<ret>'
+}