Updated kakoune and emacs

2026-07-25 13:38:59 -06:00
parent 7cd118b1a1
commit 3aa286c2bf
4 changed files with 224 additions and 257 deletions
--- a/config/.config/kak/kakrc
+++ b/config/.config/kak/kakrc
@@ -16,111 +16,125 @@ plug "andreyorst/smarttab.kak" defer smarttab %{
 plug "occivink/kakoune-sudo-write"

 plug "kak-lsp/kak-lsp" do %{
-        cargo install --locked --force --path .
-}
-
-plug "gustavo-hms/luar" %{
-    plug "gustavo-hms/peneira" %{
-        require-module peneira
-    }
+    cargo install --locked --force --path .
 }

 plug "h-youhei/kakoune-surround"

-plug "your-tools/kak-subvert" do %{
-    cargo install --locked --force --path .
+plug "eburghar/kakpipe" do %{
+    cargo install --force --path . --root ~/.local
+} config %{
+    require-module kakpipe
 }

-plug "https://git.sr.ht/~nasmevka/repl.kak"
-
-plug "https://gitlab.com/kstr0k/mru-files.kak" demand mru-files %{  # %{} needed even if empty
-  # suggested mappings: *after* plugin loads
-  # think "go alt[ernate]-f[iles]"
-  # map global goto <a-f> '<esc>: mru-files ' -docstring 'mru-files'
-  # map global goto <a-F> '<esc>: mru-files-related<ret>' -docstring 'mru-files-related'
+plug "gustavo-hms/luar" %{
+    require-module luar
+}
+plug "gustavo-hms/peneira" %{
+    require-module peneira
 }

-plug "custom-filetypes" load-path "~/.config/kak/al"
+plug "caksoylar/kakoune-focus" config %{
+     # configuration here
+}
+
+plug "jtrv/grep-write.kak"
 # # Color Themes
 plug "tinted-theming/base16-kakoune" theme
 plug "https://git.sr.ht/~hadronized/kakoune-tree-sitter-themes" theme
 ### End Of Plugins ###

-set-option global luar_interpreter luajit
-
 ## Treesitter ##
 eval %sh{ kak-tree-sitter -dksvvv --with-highlighting --with-text-objects --init $kak_session }
-#eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session }
-#eval %sh{ kak-tree-sitter -dks  --with-highlighting --session $kak_session }
-#eval %sh{ kak-tree-sitter -dksvvv --init $kak_session }
-#
-# evaluate-commands %sh{
-#     echo "colorscheme base16-$BASE16_THEME"
-# }
-
-## Popup ##
-evaluate-commands %sh{kak-popup init}

 ## Highlighting ##
 hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor}
 add-highlighter global/ show-matching
-add-highlighter global/ column 80 MenuBackground
 add-highlighter global/ show-whitespaces -spc " " -nbsp ""
-#add-highlighter global/ show-whitespaces -nbsp "" -lf "" -indent "|"

 ## Wrapping ##

 add-highlighter global/ wrap -word -indent

 ## Formatting ##
-# define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{
-#
-#
-#     hook global -group autofmt BufSetOption filetype=(zig) %{
-#         set-option buffer formatcmd 'zig fmt --stdin'
-#
-#         hook -group autofmt buffer BufOpenFile .* %{
-#             format
-#         }
-#
-#         hook -group autofmt buffer BufWritePre .* %{
-#             format
-#         }
-#     }
-#
-#     hook global -group autofmt BufSetOption filetype=(html) %{
-#         set-option buffer formatcmd 'prettier --tab-width 4 --parser html'
-#
-#         hook -group autofmt buffer BufOpenFile .* %{
-#             format
-#         }
-#
-#         hook -group autofmt buffer BufWritePre .* %{
-#             format
-#         }
-#     }
-#
-#     hook global -group autofmt BufSetOption filetype=(css) %{
-#         set-option buffer formatcmd 'prettier --tab-width 4 --parser css'
-#
-#         hook -group autofmt buffer BufOpenFile .* %{
-#             format
-#         }
-#
-#         hook -group autofmt buffer BufWritePre .* %{
-#             format
-#         }
-#     }
+define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{
+
+
+    hook global -group autofmt BufSetOption filetype=(zig) %{
+        set-option buffer formatcmd 'zig fmt --stdin'
+
+        hook -group autofmt buffer BufOpenFile .* %{
+            format
+        }
+
+        hook -group autofmt buffer BufWritePre .* %{
+            format
+        }
+    }
+
+    hook global -group autofmt BufSetOption filetype=(html) %{
+        set-option buffer formatcmd 'prettier --tab-width 4 --parser html'
+
+        hook -group autofmt buffer BufOpenFile .* %{
+            format
+        }
+
+        hook -group autofmt buffer BufWritePre .* %{
+            format
+        }
+    }
+
+    hook global -group autofmt BufSetOption filetype=(css) %{
+        set-option buffer formatcmd 'prettier --tab-width 4 --parser css'
+
+        hook -group autofmt buffer BufOpenFile .* %{
+            format
+        }
+
+        hook -group autofmt buffer BufWritePre .* %{
+            format
+        }
+    }
+    hook global -group autofmt BufSetOption filetype=(javascript) %{
+        set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript'
+
+        hook -group autofmt buffer BufOpenFile .* %{
+            format
+        }
+
+        hook -group autofmt buffer BufWritePre .* %{
+            format
+        }
+    }
+
+    hook global -group autofmt BufSetOption filetype=(go) %{
+        set-option buffer formatcmd 'gofmt'
+
+        hook -group autofmt buffer BufOpenFile .* %{
+            format
+        }
+
+        hook -group autofmt buffer BufWritePre .* %{
+            format
+        }
+    }
+}
+
+define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{
+    remove-hooks global autofmt
+}
+
+# enable-autofmt

 ## Indentation ##
 set global tabstop 4
 set global indentwidth 4
 hook global WinSetOption filetype=.* expandtab
-hook global WinSetOption filetype=(makefile|gas) noexpandtab
-hook global BufCreate .* %{
-    editorconfig-load
-    autoconfigtab
-}
+hook global WinSetOption filetype=(makefile|gas|go) noexpandtab
+# hook global BufCreate .* %{
+#     editorconfig-load
+#     autoconfigtab
+# }

 define-command set-spell -docstring 'Enable spellcheck' %{
    # hook -group spellcheck global BufOpenFile .* %{
@@ -145,6 +159,7 @@ define-command set-nospell -docstring 'Disable spellcheck' %{
 define-command sleuth -docstring 'Heuristically set buffer options' %{
  try %{
    evaluate-commands -draft %{
+        info 'trying'
      # Search the first indent level
      execute-keys 'gg' '/' '^\h+' '<ret>'

@@ -191,6 +206,8 @@ define-command sleuth-disable -docstring 'Disable sleuth' %{
  remove-hooks global sleuth
 }

+sleuth-enable
+
 ## LSP ##
 lsp-enable
 lsp-inlay-diagnostics-enable global
@@ -244,154 +261,79 @@ hook -group lsp-filetype-typst global BufSetOption filetype=typst %{
        # previewFeature = "disable"
    }
 }
+
 set-option global lsp_config %{
 }

+declare-option str findcmd 'fd'
+
+define-command -docstring 'Find file' fd -params 1 %{
+    edit %arg{1}
+}
+
+complete-command fd shell-script-candidates %opt{findcmd}
+
+declare-option -hidden str-list last_command
+
+define-command -hidden run_cmd -params .. %{
+    kakpipe -n %arg{1} %arg{@}
+}
+
+define-command -hidden run_cmd_bg -params .. %{
+    kakpipe-bg -n %arg{1} %arg{@}
+}
+
+define-command -docstring 'run command in fifo' cmd -params .. %{
+    run_cmd %arg{@}
+    set-option global last_command %arg{@}
+    set-option buffer filetype cmd
+}
+
+define-command -docstring 'run command in fifo (background buffer)' cmd-bg -params .. %{
+    run_cmd_bg %arg{@}
+    set-option global last_command %arg{@}
+    set-option buffer filetype cmd
+}
+
+define-command -docstring 'rerun last command' rcmd %{
+    cmd %opt{last_command}
+}
+
+define-command -docstring 'rerun last command in background' rcmd-bg %{
+    cmd-bg %opt{last_command}
+}
+
+define-command -hidden cmd-jump %{
+    evaluate-commands -save-regs a %{
+        try %{
+            execute-keys 'ght<ret>"ay'
+            evaluate-commands -try-client %opt{jumpclient} -verbatim -- edit -existing -- %reg{a}
+            try %{ focus %opt{jumpclient} }
+        } catch %{
+            jump
+        }
+    }
+}
+
+hook -group cmd-highlight global WinSetOption filetype=cmd %{
+    add-highlighter window/cmd group
+    add-highlighter window/cmd/location regex "^([^:\n]+):(\d+):(\d+)?" 1:cyan 2:green 3:green
+    add-highlighter window/cmd/path regex "^([^:\n]+[^/])$" 1:cyan
+    add-highlighter window/cmd/ line %{%opt{jump_current_line}} default+b
+    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/cmd }
+}
+
+hook global WinSetOption filetype=cmd %{
+    hook buffer -group cmd-hooks NormalKey <ret> cmd-jump
+    hook -once -always window WinSetOption filetype=.* %{ remove-hooks buffer cmd-hooks }
+}
+
 define-command fzf-buffer -docstring 'Invoke fzf to select a buffer' %{
    evaluate-commands %sh{
        tmux split-window -l 20% "(printf \"%s\n\" $kak_quoted_buflist | fzf --bind 'focus:execute-silent(echo \"eval -client $kak_client %{ e {} }\" | kak -p $kak_session)' || echo \"$kak_buffile\") | xargs -I{} echo \"eval -client $kak_client %{ e '{}' }\" | /usr/bin/kak -p $kak_session"
    }
 }

-define-command -docstring 'Invoke fzf to select a buffer' prev-fzf-buff %{
-    evaluate-commands %sh{
-        BUFFER=$(
-            (
-                eval "set -- $kak_buflist"
-                while [ $# -gt 0 ]; do
-                    printf "%s\0" "$1"
-                    shift
-                done
-            ) |
-            fzf-tmux --cycle -p 80%,90% --read0 --preview='bat --theme=base16-256 --color=always {} 2>/dev/null'
-        )
-        if [ -n "$BUFFER" ]; then
-            printf "buffer %s" "${BUFFER}"
-        fi
-    }
-}
-
-define-command -docstring 'live grep' live-grep %{
-    evaluate-commands %sh{
-
-        if [ -z "${kak_client_env_TMUX}" ]; then
-            printf 'fail "client was not started under tmux"\n'
-        else
-            file="$(rfv.sh)"
-            if [ -n "$file" ]; then
-                printf "edit %s\n" "$file"
-            fi
-        fi
-	}
-}
-
-define-command -docstring 'exact grep' exact-grep %{
-    evaluate-commands %sh{
-
-        if [ -z "${kak_client_env_TMUX}" ]; then
-            printf 'fail "client was not started under tmux"\n'
-        else
-            file="$(rfve.sh)"
-            if [ -n "$file" ]; then
-                printf "edit %s\n" "$file"
-            fi
-        fi
-	}
-}
-
-define-command -docstring 'search contents of current file' file-search %{
-    evaluate-commands -save-regs '"' %{
-        set-register dquote %sh{ mktemp }
-        execute-keys -draft '%<a-|> cat > $kak_reg_dquote<ret>'
-        evaluate-commands %sh{
-            if [ -z "${kak_client_env_TMUX}" ]; then
-                printf 'fail "client was not started under tmux"\n'
-            else
-                file="$(rfs.sh ${kak_reg_dquote} ${kak_buffile})"
-                if [ -n "$file" ]; then
-                    printf "edit %s\n" "$file"
-                fi
-                rm $kak_reg_dquote
-            fi
-        }
-    }
-}
-
-define-command -docstring 'search contents of current file with regex' regex-file-search %{
-    evaluate-commands -save-regs '"' %{
-        set-register dquote %sh{ mktemp }
-        execute-keys -draft '%<a-|> cat > $kak_reg_dquote<ret>'
-        evaluate-commands %sh{
-            if [ -z "${kak_client_env_TMUX}" ]; then
-                printf 'fail "client was not started under tmux"\n'
-            else
-                file="$(rgrs.sh ${kak_reg_dquote} ${kak_buffile})"
-                if [ -n "$file" ]; then
-                    printf "edit %s\n" "$file"
-                fi
-                rm $kak_reg_dquote
-            fi
-        }
-    }
-}
-
-define-command -docstring 'Invoke fzf to open a file' -params 0 fzf-edit %{
-    evaluate-commands %sh{
-        if [ -z "${kak_client_env_TMUX}" ]; then
-            printf 'fail "client was not started under tmux"\n'
-        else
-            file="$(fd -t f . |TMUX="${kak_client_env_TMUX}" fzf-tmux --cycle -p 80%,90% --preview='bat --theme=base16-256 --color=always {} 2>/dev/null || cat {} 2>/dev/null')"
-            if [ -n "$file" ]; then
-                printf "edit %s\n" "$file"
-            fi
-        fi
-    }
-}
-
-define-command -docstring 'Invoke fzf to open a file local to the current file' -params 0 fzf-edit-local %{
-    evaluate-commands %sh{
-        if [ -z "${kak_client_env_TMUX}" ]; then
-            printf 'fail "client was not started under tmux"\n'
-        else
-            dir="$(get_local_path ${kak_buffile})"
-            if [ -n "$dir" ]; then
-                file="$(fd -u -t f . $dir |TMUX="${kak_client_env_TMUX}" fzf-tmux --cycle -p 80%,90% --preview='bat --theme=base16-256 --color=always {} 2>/dev/null || cat {} 2>/dev/null')"
-            fi
-            if [ -n "$file" ]; then
-                printf "edit %s\n" "$file"
-            fi
-        fi
-    }
-}
-
-define-command -docstring 'Pick project' -params 0 switch-project %{
-    evaluate-commands %sh{
-        if [ -z "${kak_client_env_TMUX}" ]; then
-            printf 'fail "client was not started under tmux"\n'
-        else
-            proj="$(cat ~/.scripts/projects | TMUX="${kak_client_env_TMUX}" fzf-tmux --cycle -p 80%,90% | cut -d' ' -f1)"
-            if [ -n "$proj" ]; then
-                printf "cd %s\n" "$proj"
-                printf 'fzf-edit\n'
-            fi
-        fi
- 	}
-}
-
-define-command -docstring 'Project wide search' project-search %{
-    evaluate-commands %sh{
-
-        if [ -z "${kak_client_env_TMUX}" ]; then
-            printf 'fail "client was not started under tmux"\n'
-        else
-            file="$(rgfs.sh)"
-            if [ -n "$file" ]; then
-                printf "edit %s\n" "$file"
-            fi
-        fi
-	}
-}
-
 define-command -docstring 'Print Working Directory' -params 0 pwd %{
    evaluate-commands echo %sh{ echo "$(pwd)"}
 }
@@ -423,8 +365,8 @@ map -docstring 'enter config mode' global user e ':enter-user-mode config<ret>'
 map -docstring 'edit kakoune config' global config k ':e ~/.config/kak/kakrc<ret>'
 map -docstring 'edit tmux config' global config t ':e ~/.tmux.conf<ret>'
 map -docstring 'edit bash config' global config b ':e ~/.bashrc<ret>'
-map -docstring 'edit scripts folder' global config s ':cd ~/.scripts<ret>:fzf-edit<ret>'
-map -docstring 'edit .config folder' global config c ':cd ~/.config<ret>:fzf-edit<ret>'
+map -docstring 'edit scripts folder' global config s ':cd ~/.scripts<ret>:peneira-files<ret>'
+map -docstring 'edit .config folder' global config c ':cd ~/.config<ret>:peneira-files<ret>'

 declare-user-mode buffer
 map -docstring 'enter buffer mode' global user b ':enter-user-mode buffer<ret>'
@@ -436,20 +378,15 @@ map -docstring 'list and select a buffer' global buffer b ':fzf-buffer<ret>'

 declare-user-mode find
 map -docstring 'enter find mode' global user f ':enter-user-mode find<ret>'
-map -docstring 'find files' global find f ':fzf-edit<ret>'
-map -docstring 'find tags for the current project' global find t ':ctags-search '
-map -docstring 'find line in current file' global find l ':file-search<ret>'
-map -docstring 'find line in current file with regex' global find L ':regex-file-search<ret>'
-map -docstring 'find files in current directory' global find F ':fzf-edit-local<ret>'
-map -docstring "grep file contents recursively" global find g ':live-grep<ret>'
-map -docstring "grep exact file contents recursively" global find e ':exact-grep<ret>'
-map -docstring 'project wide search' global find p ':project-search<ret>'
+map -docstring 'find files' global find f ':peneira-files<ret>'
+map -docstring 'find tags for the current project' global find t ':peneira-symbols<ret>'
+map -docstring 'find files in current directory' global find F ':peneira-local-files<ret>'

 map -docstring 'enter lsp mode' global user l ':enter-user-mode lsp<ret>'
 map -docstring 'goto definition (tag)' global lsp t '<a-i>w:ctags-search<ret>'

 map -docstring 'enter treesitter mode' global user t ':enter-user-mode tree-sitter<ret>'
-map -docstring 'enter treesitter search mode' global user s ':enter-user-mode tree-sitter-search<ret>'
+# map -docstring 'enter treesitter search mode' global user s ':enter-user-mode tree-sitter-search<ret>'

 declare-user-mode tmux
 map -docstring 'enter tmux/window mode' global user w ':enter-user-mode tmux<ret>'
@@ -461,23 +398,28 @@ map -docstring 'horizontal terminal split' global tmux H ':tmux-repl-vertical ba
 map -docstring 'new terminal tab' global tmux T ':tmux-repl-window<ret>'
 map -docstring 'new git window' global tmux g ':tmux-terminal-window lazygit<ret>'

-declare-user-mode project
-map -docstring 'enter project mode' global user p ':enter-user-mode project<ret>'
-map -docstring 'open project' global project o ':switch-project<ret>'
-
 map -docstring 'enter man mode' global user m ':enter-user-mode man<ret>'

-declare-user-mode general
-map -docstring 'enter general keybinds mode' global user g ':enter-user-mode general<ret>'
 #map -docstring 'clipboard yank' global user y '<a-|>clip.exe<ret>'
-map -docstring 'clipboard yank' global general y ':xcopy<ret>'
+map -docstring 'clipboard yank' global user y ':xcopy<ret>'
 #map -docstring 'clipboard paste' global user p '|powershell.exe -C Get-Clipboard | tr -d "\r"<ret>'
-map -docstring 'clipboard paste' global general p ':xpaste<ret>'
-map -docstring 'quit kakoune' global general q ':q<ret>'
-map -docstring 'toggle comments' global general c ':comment-line<ret>'
+map -docstring 'clipboard paste' global user p ':xpaste<ret>'
+map -docstring 'toggle comments' global user c ':comment-line<ret>'
+
+declare-user-mode subvert
+map global user s ':enter-user-mode subvert<ret>' -docstring 'enter subvert user mode'
+map global subvert a '<esc>| kak-subvert ada <ret>' -docstring 'convert to Ada case'
+map global subvert c '<esc>| kak-subvert camel <ret>' -docstring 'convert to camel case'
+map global subvert k '<esc>| kak-subvert kebab <ret>' -docstring 'convert to kebab case'
+map global subvert p '<esc>| kak-subvert pascal <ret>' -docstring 'convert to pascal case'
+map global subvert . '<esc>| kak-subvert sentence <ret>' -docstring 'convert to sentence case'
+map global subvert s '<esc>| kak-subvert snake <ret>' -docstring 'convert to snake case'
+map global subvert S '<esc>| kak-subvert screaming <ret>' -docstring 'convert to screaming case'
+map global subvert t '<esc>| kak-subvert train <ret>' -docstring 'convert to train case'
+map global subvert T '<esc>| kak-subvert title <ret>' -docstring 'convert to title case'

 declare-user-mode spell
-map -docstring 'enter spell mode' global general s ':enter-user-mode spell<ret>'
+map -docstring 'enter spell mode' global user S ':enter-user-mode spell<ret>'
 map -docstring 'enable spell check' global spell s ':spell<ret>'
 map -docstring 'clear spell check' global spell c ':spell-clear<ret>'
 map -docstring 'next spell check' global spell n ':spell-next<ret>'
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,7 +1,7 @@
 {
  "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" },
-  "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
-  "catppuccin": { "branch": "main", "commit": "a7788416689dbefea659d9e9415c87926b0ba5d8" },
+  "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
+  "catppuccin": { "branch": "main", "commit": "058e83dc009e4dd62f30807054de9cc849699e27" },
  "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
  "command.nvim": { "branch": "main", "commit": "cf73df4f9afc123b1fc3a8674d3fae08d2ad67db" },
  "compiler-explorer.nvim": { "branch": "master", "commit": "523c6a7a3d8c034b421a71eb20b0da75b0b16f62" },
@@ -15,17 +15,17 @@
  "firenvim": { "branch": "master", "commit": "a18ef908ac06b52ad9333b70e3e630b0a56ecb3d" },
  "github-colors": { "branch": "main", "commit": "7292749e49e6f870e63879a528bb05c8c8d1a59a" },
  "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
-  "gitsigns.nvim": { "branch": "main", "commit": "caa98e2e5e4c23a1652c23be839d2e1722cecc29" },
-  "gruvbox-material": { "branch": "master", "commit": "790afe9dd085aa04eccd1da3626c5fa05c620e53" },
-  "gruvbox.nvim": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" },
-  "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" },
+  "gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" },
+  "gruvbox-material": { "branch": "master", "commit": "11d779b26a9ab2b3db8c22c6ac9fb6e8ed4fea79" },
+  "gruvbox.nvim": { "branch": "main", "commit": "154eb5ff5b96d0641307113fa385eaf0d36d9796" },
  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
  "leap.nvim": { "branch": "main", "commit": "b960d5038c5c505c52e56a54490f9bbb1f0e6ef6" },
  "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
  "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" },
-  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
+  "markview.nvim": { "branch": "main", "commit": "2471f4097f8561a6880a0fe05ee0f21cbc82b374" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "7adc933dabcc7c86ae6b07aff7ee68eac398491f" },
+  "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
  "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" },
  "mellow.nvim": { "branch": "main", "commit": "6273b7f0ddf6ac2b75021b3bc0bd8b3305cfeef1" },
  "mini.nvim": { "branch": "main", "commit": "3923662bf3d6ca49a9503f8d7196ea0450983e6a" },
@@ -35,22 +35,22 @@
  "moonscript-vim": { "branch": "master", "commit": "715c96c7c3b02adc507f84bf5754985460afc426" },
  "multicursor.nvim": { "branch": "1.0", "commit": "704b99f10a72cc05d370cfeb294ff83412a8ab55" },
  "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
-  "nelua.vim": { "branch": "main", "commit": "08ddb2e0dda7d2bd6cd9d4efadb6a07547e135c3" },
-  "neogit": { "branch": "master", "commit": "4681c1fdac1b730592ae195576e87406f7255750" },
-  "neorg": { "branch": "main", "commit": "408fc04013a95da8f217cb0958a06b6a77c01743" },
-  "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
+  "nelua.vim": { "branch": "main", "commit": "1342286a1c06fc2cef50f06cd34dfcdd8df5b65c" },
+  "neogit": { "branch": "master", "commit": "f8674ec894315c02449b61c9de9a116c5aafeb90" },
+  "neorg": { "branch": "main", "commit": "a09e0bb9b32e2d0406d4503ae8c1a7ad2ca83eae" },
+  "nightfox.nvim": { "branch": "main", "commit": "4dacd3f0185a2227bdf3b6c0975a8f0bf87cac9a" },
  "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5492a24edd68f78d8a778edcb8905d0a28993abc" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "e4c7af0211866162d999ce0bdd6a029302e19139" },
+  "nvim-lspconfig": { "branch": "master", "commit": "98b0b8a52742afc9e2e2078e2e451f91beef1717" },
+  "nvim-nio": { "branch": "master", "commit": "edcc181a875301dd21840189aa2f2f9ad69fc172" },
  "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
-  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
-  "nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "nvim-treesitter": { "branch": "main", "commit": "df7489eeea351bece7fd0f9c825be5cb6a1438f0" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "898ee307df58f854d11cd7edd06472574d48014e" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
+  "nvim-unception": { "branch": "main", "commit": "f14eeb22238d2c2bdafe9a2e5e1f4bd200d0e450" },
+  "nvim-web-devicons": { "branch": "master", "commit": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f" },
  "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
  "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
  "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
--- a/config/.emacs.d/config/keymap.el
+++ b/config/.emacs.d/config/keymap.el
@@ -6,6 +6,7 @@
 (global-set-key (kbd "C-c x") #'kill-current-buffer)
 (global-set-key (kbd "C-c X") (lambda () (interactive) (other-window 1) (kill-buffer-and-window)))
 (global-set-key (kbd "C-c g") #'consult-ripgrep)
+(global-set-key (kbd "C-c C-g") (lambda () (interactive) (let ((current-prefix-arg '(4))) (call-interactively #'consult-ripgrep))))
 (global-set-key (kbd "C-c L") #'consult-line)
 (global-set-key (kbd "C-c i") #'consult-info)
 (global-set-key (kbd "C-c s") #'ispell-word)
--- a/config/.emacs.d/plugins/utils.el
+++ b/config/.emacs.d/plugins/utils.el
@@ -24,6 +24,30 @@
  :defer t
  :bind-keymap ("M-'" . surround-keymap))

+(use-package noccur
+  :ensure t)
+
+(use-package dumb-jump
+  :ensure t
+  :config
+  (add-hook 'xref-backend-functions #'dumb-jump-xref-activate))
+
+(use-package expand-region
+  :ensure t
+  :bind (("C-= =" . er/expand-region)
+         ("C-= w" . er/mark-word)
+         ("C-= s" . er/mark-symbol)
+         ("C-= S" . er/mark-symbol-with-prefix)
+         ("C-= f" . er/mark-defun)
+         ("C-= c" . er/mark-comment)
+         ("C-= m" . er/mark-method-call)
+         ("C-= a" . er/mark-next-accessor)
+         ("C-= p" . er/mark-inside-pairs)
+         ("C-= P" . er/mark-outside-pairs)
+         ("C-= '" . er/mark-inside-quotes)
+         ("C-= \"" . er/mark-outside-quotes)))
+         
+
 (use-package dirvish
  :ensure t
  :defer t