merge master

config/.config/kak-tree-sitter/config.toml

@@ -1,9 +1,9 @@
 # lua
-[language.lua.grammar.source.git]
+[lua.grammar.source.git]
 url = "https://github.com/tree-sitter-grammars/tree-sitter-lua"
 pin = "88e446476a1e97a8724dff7a23e2d709855077f2"
 
-[language.lua.grammar]
+[lua.grammar]
 path = "src"
 compile = "cc"
 compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
@@ -44,11 +44,11 @@ path = "runtime/queries/lua"
 # path = "runtime/queries/clojure"
 
 #ocaml
-[language.ocaml.grammar.source.git]
+[ocaml.grammar.source.git]
 url = "https://github.com/tree-sitter/tree-sitter-ocaml"
 pin = "ef6ed4a773a260545f0b03c43d2ca78235e9a488"
 
-[language.ocaml.grammar]
+[ocaml.grammar]
 path = "grammars/ocaml/src"
 compile = "cc"
 compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
@@ -65,11 +65,11 @@ pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
 path = "runtime/queries/ocaml"
 
 # typst
-[language.typst.grammar.source.git]
+[typst.grammar.source.git]
 url = "https://github.com/uben0/tree-sitter-typst"
 pin = "46cf4ded12ee974a70bf8457263b67ad7ee0379d"
 
-[language.typst.grammar]
+[typst.grammar]
 path = "src"
 compile = "cc"
 compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
@@ -86,11 +86,11 @@ pin = "46cf4ded12ee974a70bf8457263b67ad7ee0379d"
 path = "queries/typst"
 
 # swift
-[language.swift.grammar.source.git]
+[swift.grammar.source.git]
 url = "https://github.com/alex-pinkus/tree-sitter-swift"
 pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704"
 
-[language.swift.grammar]
+[swift.grammar]
 path = "src"
 compile = "cc"
 compile_args = ["-c", "-fpic", "../scanner.c", "-I", ".."]

config/.config/kak/kakrc

@@ -111,10 +111,6 @@ add-highlighter global/ wrap -word -indent
 #             format
 #         }
 #     }
-<<<<<<< HEAD
-=======
-
->>>>>>> master
 #     hook global -group autofmt BufSetOption filetype=(javascript) %{
 #         set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript'
 #
@@ -147,10 +143,7 @@ add-highlighter global/ wrap -word -indent
 # enable-autofmt
 #
 #
-<<<<<<< HEAD
-=======
-#
->>>>>>> master
+
 ## Indentation ##
 set global tabstop 4
 set global indentwidth 4
@@ -459,7 +452,7 @@ define-command -docstring 'paste from clipboard' xpaste %{
 
 declare-user-mode config
 map -docstring 'enter config mode' global user e ':enter-user-mode config<ret>'
-map -docstring 'edit kakoune config' global config k ':cd ~/.config/kak/<ret>:e ./kakrc<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>'

config/.config/nvim/lua/config/keymap.lua

@@ -5,7 +5,7 @@ end
 
 setnx('<leader>ff', Snacks.picker.files, 'Find files')
 setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word')
-setnx('<leader>f?', Snacks.picker.grep, 'Search in files')
+setnx('<leader>fg', Snacks.picker.grep, 'Search in files')
 setnx('<leader>fr', Snacks.picker.recent, 'Find recent files')
 setnx('<leader>b', Snacks.picker.buffers, 'List buffers')
 setnx('<leader>h', Snacks.picker.help, 'Search help')
@@ -42,7 +42,7 @@ setnx('`', '\'', 'Goto mark without column')
 
 setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')
 
-setnx('grR', Snacks.picker.lsp_references, 'Search lsp references')
+setnx('grr', Snacks.picker.lsp_references, 'Search lsp references')
 -- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
 -- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
 setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics')

config/.config/nvim/lua/plugins/lsp.lua

@@ -71,6 +71,9 @@ return {
             },
             -- (Default) Only show the documentation popup when manually triggered
             completion = {
+                trigger = {
+                    show_on_insert = true
+                },
                 documentation = { auto_show = false },
                 list = {
                     selection = {