dotfiles
bugabingas dorkfiles
owned by bugabinga
Merge branch 'trunk' of github.com:bugabinga/dotfiles into trunk
6fe5949cc2acc298d8c5f64353dcae30ddf399e8
Oliver Jan Krylow <oliver@bugabinga.net> ·
unsigned
Browse filesCompare with HEAD
Changed files (20)
neovim/.lazy.specs.lua
Modified 3 - 'WhoIsSethDaniel/mason-tool-installer.nvim',
13 3 'stevearc/conform.nvim',
42 +* navic highlights do not fit winbar
42 43 * make highlights more visible when expanding snippets
44 - cursor restore position on (session?) load jumps one location to somewhere
44 +* cursor restore position on (session?) load jumps one location to somewhere
45 45 after correct location
46 -* toggling case conventions
47 -* Move to treesitter main branch
48 46 * check out `vim.snippet`
49 47 * use `vim.base64` in wezterm plugin
51 - LuaLS is getting crazy diagnosing non-stop...
52 48 * integrate language tool?
53 -* ]s [s to jump to spelling mistakes
54 -* learn marks and refactor mark.lua
55 -* try Termdebug with gdb
56 50 * adapt config to respect `vim.g.nerdfont` (std.constants?)
51 +* Do I want multiple LSPs per buffer?
52 + In case of markdown and text it seems useful, for code it seems like a
57 54 * use ltex-ls for markdown, code comments and commit messages
59 - <https://github.com/stevearc/dotfiles/blob/master/.config/nvim/plugin/exrc.lua>
60 - and maybe adapt `std.localrc`
62 56 * nvim spell for camel case words
63 57 * add nu-check to nvim-lint
68 62 * split parts of config into plugins
69 63 * add support for Java multi line string in autopairs
70 -* pandoc with lua filters for diagrams for generating documents and previewing
71 - --> https://github.com/tex/vimpreviewpandoc
64 +* try Termdebug with gdb
neovim/after/queries/lua/highlights.scm
Modified 1 -((
"local" @keyword) (#set! conceal
"⋅"))
2 -((
"function" @keyword.function) (#set! conceal
"ϝ"))
3 -((
"end" @keyword.function) (#set! conceal
"∎"))
4 -((
"return" @keyword.return) (#set! conceal
"↳"))
5 -((
"then" @conditional) (#set! conceal
"⟶"))
7 -((dot_index_expression table: (identifier) @variable (#eq? @variable
"vim")) (#set! conceal
""))
9 -((function_call name: (identifier) @function (#eq? @function
"require")) (#set! conceal
""))
3 +((
"local" @keyword) (#set! conceal
"·"))
4 +((
"function" @keyword.function) (#set! conceal
"λ"))
5 +((
"return" @keyword.return) (#set! conceal
""))
neovim/ftplugin/lua.lua
Modified 5 5 vim.opt_local.path:append( path
.. '/lua' )
7 7 vim.opt_local.suffixesadd:prepend
'.lua' 8 +vim.opt_local.conceallevel
= 1 9 10 local map
= require 'std.map' 24 25 prequire
'nvim-surround'.buffer_setup {
neovim/lazy-lock.json
Modified27 27 "mini.bracketed": {
"branch":
"main",
"commit":
"65c7dfb51e832de9e279e5d5b0741e7af6755ab5" },
28 28 "mkdir.nvim": {
"branch":
"main",
"commit":
"c55d1dee4f099528a1853b28bb28caa802eba217" },
29 29 "neodev.nvim": {
"branch":
"main",
"commit":
"ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
30 - "neogen": {
"branch":
"main",
"commit":
"0daffcec249bf42275e322361fe55b89a05ff278" },
31 30 "neorg": {
"branch":
"main",
"commit":
"c17b8e9e7327e03f78fbdccfb15abd09ec607bd0" },
32 31 "neotest": {
"branch":
"master",
"commit":
"f03a78cef74db5638e4312e18b767294a90de8da" },
33 32 "neotest-plenary": {
"branch":
"master",
"commit":
"dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" },
52 51 "nvim-surround": {
"branch":
"main",
"commit":
"a4e30d33add8a9743b4f518b3a788b3c8e5def71" },
53 52 "nvim-tree.lua": {
"branch":
"master",
"commit":
"ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" },
54 53 "nvim-treesitter": {
"branch":
"master",
"commit":
"baaae36ac709f405c0ee5d39ef9ffd8d8160f1a3" },
54 + "nvim-treesitter-context": {
"branch":
"master",
"commit":
"e6e71047bb323fb36f5664993a42adaac252bb36" },
55 55 "nvim-treesitter-endwise": {
"branch":
"master",
"commit":
"60e8c288e011403f248b5f6478dde12bed8a6c55" },
56 56 "nvim-treesitter-textobjects": {
"branch":
"master",
"commit":
"23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
57 57 "nvim-ts-autotag": {
"branch":
"main",
"commit":
"531f48334c422222aebc888fd36e7d109cb354cd" },
75 75 "telescope-symbols.nvim": {
"branch":
"master",
"commit":
"a6d0127a53d39b9fc2af75bd169d288166118aec" },
76 76 "telescope-zoxide": {
"branch":
"main",
"commit":
"68966349aa1b8e9ade403e18479ecf79447389a7" },
77 77 "telescope.nvim": {
"branch":
"master",
"commit":
"6312868392331c9c0f22725041f1ec2bef57c751" },
78 + "text-case.nvim": {
"branch":
"main",
"commit":
"d62c63a4e9a996c7321885937ab89920fca2c1c8" },
78 79 "tint.nvim": {
"branch":
"master",
"commit":
"862835626941d263466754b9c8e2ce2cb004f5ac" },
79 80 "todo-comments.nvim": {
"branch":
"main",
"commit":
"a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
80 81 "tree-sitter-nu": {
"branch":
"main",
"commit":
"b090676f0205f52debb93745b9ad788385583276" },
neovim/lua/bugabinga/diagnostic.lua
Modified 36 36 diagnostic.config {
39 - severity = {
min = diagnostic.severity.WARN, },
43 - format = diagnostic_format,
48 - border = vim.g.border_style,
50 - header =
'Diagnostic',
51 - prefix = prefix_format,
53 - update_in_insert =
false,
55 - severity_sort =
true,
39 + severity = {
min = diagnostic.severity.WARN },
43 + format = diagnostic_format,
49 + header =
'Diagnostic',
50 + prefix = prefix_format,
52 + update_in_insert =
false,
54 + severity_sort =
true,
58 57 local sign = function ( options )
neovim/lua/bugabinga/lsp/clients/java.lua
Modified107 107 jdk17.path
= '/usr/lib64/jvm/java-17-openjdk-17' 108 108 jdk21.path
= '/usr/lib64/jvm/java-21-openjdk-21' 109 109 elseif host
== 'NB-00718' then
110 - jdk11.path
= 'C:/Users/okr/scoop/apps/openjdk11' 111 - jdk17.path
= 'C:/Users/okr/scoop/apps/openjdk17' 112 - jdk21.path
= 'C:/Users/okr/scoop/apps/openjdk21' 110 + jdk11.path
= 'C:/Users/okr/scoop/apps/openjdk11/current' 111 + jdk17.path
= 'C:/Users/okr/scoop/apps/openjdk17/current' 112 + jdk21.path
= 'C:/Users/okr/scoop/apps/openjdk21/current' 114 114 vim.notify
'missing jdk paths in java settings for lsp' neovim/lua/bugabinga/options/behaviour.lua
Modified 14 14 vim.opt.whichwrap:append
'h' 15 15 vim.opt.whichwrap:append
'l' 18 +vim.opt.iskeyword:append
'-' 19 22 vim.opt.expandtab
= false neovim/lua/bugabinga/options/ui.lua
Modifiedneovim/lua/bugabinga/plugins/fidget.lua
Modified 3 3 local debug = require 'std.dbg' neovim/lua/bugabinga/plugins/genghis.lua
Modified 81 + 'MoveToFolderInCwd',
85 + 'CopyFilepathWithTilde',
84 86 'CopyRelativePath',
85 87 'CopyDirectoryPath',
86 88 'CopyRelativeDirectoryPath',
neovim/lua/bugabinga/plugins/lint.lua
Modified12 12 lua = {
'luacheck', },
13 13 sh = {
'shellcheck', },
14 + nu = {
'nu-check', },
neovim/lua/bugabinga/plugins/mason.lua
Modified 2 - "williamboman/mason.nvim",
2 + 'williamboman/mason.nvim',
14 - "WhoIsSethDaniel/mason-tool-installer.nvim",
14 + 'WhoIsSethDaniel/mason-tool-installer.nvim',
17 17 ensure_installed = {
18 - "lua-language-server",
20 - "editorconfig-checker",
24 - "java-debug-adapter",
18 + 'lua-language-server',
20 + 'editorconfig-checker',
24 + 'java-debug-adapter',
neovim/lua/bugabinga/plugins/neogen.lua
Modified28 28 command = function ()
require 'neogen'.generate {
type =
'class', }
end,
32 + description =
'Doc Comment for Type',
33 + category =
'generate',
34 + keys =
'<leader>gdt',
35 + command =
function ()
require 'neogen'.generate {
type =
'type', }
end,
33 40 dependencies = {
'nvim-treesitter/nvim-treesitter', },
42 + snippet_engine =
'luasnip',
neovim/lua/bugabinga/plugins/oil.lua
Modified 9 9 command = function ()
require 'oil'.open()
end,
13 + description =
'Open parent directory in a float.',
16 + command =
function ()
require 'oil'.open_float()
end,
13 20 'stevearc/oil.nvim',
neovim/lua/bugabinga/plugins/text-case.lua
Addednew file mode 100644 2 + 'johmsalas/text-case.nvim',
3 + dependencies = {
'nvim-telescope/telescope.nvim', },
5 + require 'textcase'.setup {}
6 + require 'telescope'.load_extension
'textcase' 10 + {
'gA',
'<cmd>TextCaseOpenTelescope<CR>',
mode = {
'n',
'x', },
desc =
'Telescope', },
13 + 'TextCaseOpenTelescope',
14 + 'TextCaseOpenTelescopeQuickChange',
15 + 'TextCaseOpenTelescopeLSPChange',
16 + 'TextCaseStartReplacingCommand',
neovim/lua/bugabinga/plugins/tree.lua
Modified 1 1 local map
= require 'std.map' 4 - description =
'Toggle Tree File Explorer',
5 - category =
'explorer',
7 - command =
function ()
require 'nvim-tree.api'.tree.toggle()
end,
4 + description =
'Toggle Tree File Explorer',
5 + category =
'explorer',
7 + command =
function ()
require 'nvim-tree.api'.tree.toggle()
end,
11 - 'nvim-tree/nvim-tree.lua',
13 - cmd =
'NvimTreeOpen',
15 - 'nvim-tree/nvim-web-devicons',
16 - 'antosha417/nvim-lsp-file-operations',
20 - vim.g.loaded_netrw
= 1 21 - vim.g.loaded_netrwPlugin
= 1 11 + 'nvim-tree/nvim-tree.lua',
15 + cmd =
'NvimTreeOpen',
17 + 'nvim-tree/nvim-web-devicons',
18 + 'antosha417/nvim-lsp-file-operations',
22 + vim.g.loaded_netrw
= 1 23 + vim.g.loaded_netrwPlugin
= 1 24 - vim.opt.termguicolors
= true 27 - sort_by =
'case_sensitive',
38 - config =
function ( _, opts )
39 - require 'nvim-tree'.setup( opts )
40 - require 'lsp-file-operations'.setup()
26 + vim.opt.termguicolors
= true 29 + sort_by =
'case_sensitive',
40 + config =
function ( _, opts )
41 + require 'nvim-tree'.setup( opts )
42 + require 'lsp-file-operations'.setup()
neovim/lua/bugabinga/plugins/treesitter.lua
Modified 1 1 require 'bugabinga.health'.add_dependency
4 - name_of_executable =
'cmake',
7 - name_of_executable =
'make',
10 - name_of_executable =
'zig',
13 - name =
'TreeSitter CLI',
14 - name_of_executable =
'tree-sitter',
17 - name_of_executable =
'tar',
2 +{
name =
'CMake',
name_of_executable =
'cmake', }
3 + {
name_of_executable =
'make', }
4 + {
name_of_executable =
'zig', }
5 + {
name =
'TreeSitter CLI',
name_of_executable =
'tree-sitter', }
6 + {
name_of_executable =
'tar', }
21 - 'nvim-treesitter/nvim-treesitter',
27 - require 'nvim-treesitter.install'.update {
with_sync =
true, }
30 - 'nvim-treesitter/playground',
31 - 'nvim-treesitter/nvim-treesitter-textobjects',
32 - 'windwp/nvim-ts-autotag',
33 - 'RRethy/nvim-treesitter-endwise',
34 - 'nushell/tree-sitter-nu',
36 - config =
function ()
37 - local install
= require 'nvim-treesitter.install' 38 - local configs
= require 'nvim-treesitter.configs' 9 + 'nvim-treesitter/nvim-treesitter',
15 + require 'nvim-treesitter.install'.update {
with_sync =
false, }
18 + 'nvim-treesitter/playground',
19 + 'nvim-treesitter/nvim-treesitter-textobjects',
20 + 'windwp/nvim-ts-autotag',
21 + 'RRethy/nvim-treesitter-endwise',
22 + 'nvim-treesitter/nvim-treesitter-context',
23 + 'nushell/tree-sitter-nu',
25 + config =
function ()
26 + local install
= require 'nvim-treesitter.install' 27 + local configs
= require 'nvim-treesitter.configs' 40 - install.prefer_git
= false 41 - install.compilers
= {
'zig',
'clang',
'gcc',
'cl',
'cc', vim.fn.getenv
'CC', }
29 + install.prefer_git
= false 30 + install.compilers
= {
'clang',
'zig',
'gcc',
'cl',
'cc', vim.fn.getenv
'CC', }
44 - local should_disable = function ( _, bufnr )
45 - local max_filesize
= 5 * 1024 * 1024 46 - local ok, stats
= pcall( vim.loop.fs_stat, vim.api.nvim_buf_get_name( bufnr
or 0 ) )
47 - if ok
and stats
and stats.size
> max_filesize
then 33 + local should_disable = function ( _, bufnr )
34 + local max_filesize
= 5 * 1024 * 1024 35 + local ok, stats
= pcall( vim.loop.fs_stat, vim.api.nvim_buf_get_name( bufnr
or 0 ) )
36 + if ok
and stats
and stats.size
> max_filesize
then 55 - sync_install =
false,
56 - ensure_installed = {
44 + sync_install =
false,
45 + ensure_installed = {
82 - ignore_install = {
'oil', },
85 + ignore_install = {
'oil', },
84 - auto_install =
true,
87 + auto_install =
true,
86 - autotag = {
enable =
true,
disable = should_disable, },
87 - ewndwise = {
enable =
true,
disable = should_disable, },
89 + autotag = {
enable =
true,
disable = should_disable, },
90 + endwise = {
enable =
true,
disable = should_disable, },
91 - disable = should_disable,
92 - additional_vim_regex_highlighting =
false,
94 + disable = should_disable,
95 + additional_vim_regex_highlighting =
false,
95 - incremental_selection = {
97 - disable = should_disable,
99 - init_selection =
'<up>',
100 - node_incremental =
'<up>',
101 - node_decremental =
'<down>',
102 - scope_incremental =
'<right>',
98 + incremental_selection = {
100 + disable = should_disable,
102 + init_selection =
'<up>',
103 + node_incremental =
'<up>',
104 + node_decremental =
'<down>',
105 + scope_incremental =
'<right>',
106 - indent = {
enable =
true, },
109 + indent = {
enable =
true, },
110 - disable = should_disable,
112 - persist_queries =
false,
114 - toggle_query_editor =
'o',
115 - toggle_hl_groups =
'i',
116 - toggle_injected_languages =
't',
117 - toggle_anonymous_nodes =
'a',
118 - toggle_language_display =
'I',
119 - focus_language =
'f',
120 - unfocus_language =
'F',
122 - goto_node =
'<cr>',
113 + disable = should_disable,
115 + persist_queries =
false,
117 + toggle_query_editor =
'o',
118 + toggle_hl_groups =
'i',
119 + toggle_injected_languages =
't',
120 + toggle_anonymous_nodes =
'a',
121 + toggle_language_display =
'I',
122 + focus_language =
'f',
123 + unfocus_language =
'F',
125 + goto_node =
'<cr>',
130 - disable = should_disable,
133 - [
'af'] = {
query =
'@call.outer',
desc =
'outer function call', },
134 - [
'if'] = {
query =
'@call.inner',
desc =
'inner function call', },
133 + disable = should_disable,
136 + [
'af'] = {
query =
'@call.outer',
desc =
'outer function call', },
137 + [
'if'] = {
query =
'@call.inner',
desc =
'inner function call', },
136 - [
'am'] = {
query =
'@function.outer',
desc =
'outer function definition', },
137 - [
'im'] = {
query =
'@function.inner',
desc =
'inner function definition', },
139 + [
'am'] = {
query =
'@function.outer',
desc =
'outer function definition', },
140 + [
'im'] = {
query =
'@function.inner',
desc =
'inner function definition', },
139 - [
'aa'] = {
query =
'@assignment.outer',
desc =
'outer assignment', },
140 - [
'ia'] = {
query =
'@assignment.inner',
desc =
'inner assignment', },
142 + [
'ac'] = {
query =
'@class.outer',
desc =
'outer class', },
143 + [
'ic'] = {
query =
'@class.inner',
desc =
'inner class', },
145 + [
'ai'] = {
query =
'@conditional.outer',
desc =
'outer conditional', },
146 + [
'ii'] = {
query =
'@conditional.inner',
desc =
'inner conditional', },
146 - [
'ac'] = {
query =
'@class.outer',
desc =
'outer class', },
147 - [
'ic'] = {
query =
'@class.inner',
desc =
'inner class', },
148 + [
'al'] = {
query =
'@loop.outer',
desc =
'outer loop', },
149 + [
'il'] = {
query =
'@loop.inner',
desc =
'inner loop', },
149 - [
'ao'] = {
query =
'@conditional.outer',
desc =
'outer conditional', },
150 - [
'io'] = {
query =
'@conditional.inner',
desc =
'inner conditional', },
151 + [
'aa'] = {
query =
'@parameter.outer',
desc =
'outer parameter', },
152 + [
'ia'] = {
query =
'@parameter.inner',
desc =
'inner parameter', },
152 - [
'al'] = {
query =
'@loop.outer',
desc =
'outer loop', },
153 - [
'il'] = {
query =
'@loop.inner',
desc =
'inner loop', },
154 + [
'agc'] = {
query =
'@comment.outer',
desc =
'outer comment', },
155 + [
'igc'] = {
query =
'@comment.inner',
desc =
'inner comment', },
157 + selection_modes = {
158 + [
'@parameter.outer'] =
'v',
159 + [
'@function.outer'] =
'v',
160 + [
'@class.outer'] =
'<c-v>',
163 + include_surroundig_whitespace =
true,
156 - [
'ap'] = {
query =
'@parameter.outer',
desc =
'outer parameter', },
157 - [
'ip'] = {
query =
'@parameter.inner',
desc =
'inner parameter', },
168 + disable = should_disable,
170 + [
'<leader>rwn'] = {
query =
'@parameter.inner',
desc =
'Swap parameter with next', },
173 + [
'<leader>rwp'] = {
query =
'@parameter.inner',
desc =
'Swap parameter with previous', },
159 - [
'at'] = {
query =
'@comment.outer',
desc =
'outer comment', },
179 + disable = should_disable,
180 + border = vim.g.border_style,
181 + floating_preview_opts = {},
182 + peek_definition_code = {
183 + [
'<leader>lpf'] = {
query =
'@function.outer',
desc =
'Peek definition of outer function.', },
184 + [
'<leader>lpc'] = {
query =
'@class.outer',
desc =
'Peek definition of outer class.', },
161 - [
'as'] = {
query =
'@scope',
query_group =
'locals',
desc =
'language scope', },
163 - selection_modes = {
164 - [
'@parameter.outer'] =
'v',
165 - [
'@function.outer'] =
'v',
166 - [
'@class.outer'] =
'<c-v>',
169 - include_surroundig_whitespace =
true,
174 - disable = should_disable,
176 - [
'<leader>rwn'] = {
query =
'@parameter.inner',
desc =
'Swap parameter with next', },
179 - [
'<leader>rwp'] = {
query =
'@parameter.inner',
desc =
'Swap parameter with previous', },
185 - disable = should_disable,
186 - border = vim.g.border_style,
187 - floating_preview_opts = {},
188 - peek_definition_code = {
189 - [
'<leader>lpf'] = {
query =
'@function.outer',
desc =
'Peek definition of outer function.', },
190 - [
'<leader>lpc'] = {
query =
'@class.outer',
desc =
'Peek definition of outer class.', },
196 - disable = should_disable,
199 - [
']f'] = {
query =
'@call.outer',
desc =
'Goto next function call', },
200 - [
']m'] = {
query =
'@fucntion.outer',
desc =
'Goto next function definition', },
201 - [
']c'] = {
query =
'@class.outer',
desc =
'Goto next class', },
202 - [
']o'] = {
query =
'@conditional.outer',
desc =
'Goto next conditional', },
203 - [
']p'] = {
query =
'@parameter.outer',
desc =
'Goto next parameter', },
206 - [
'[f'] = {
query =
'@call.outer',
desc =
'Goto previous function call', },
207 - [
'[m'] = {
query =
'@function.outer',
desc =
'Goto previous function definition', },
208 - [
'[c'] = {
query =
'@class.outer',
desc =
'goto previous class', },
209 - [
'[o'] = {
query =
'@conditional.outer',
desc =
'Goto previous conditional', },
210 - [
'[p'] = {
query =
'@parameter.outer',
desc =
'Goto previous parameter', },
190 + disable = should_disable,
193 + [
']f'] = {
query =
'@call.outer',
desc =
'Goto next function call', },
194 + [
']m'] = {
query =
'@fucntion.outer',
desc =
'Goto next function definition', },
195 + [
']c'] = {
query =
'@class.outer',
desc =
'Goto next class', },
196 + [
']o'] = {
query =
'@conditional.outer',
desc =
'Goto next conditional', },
197 + [
']p'] = {
query =
'@parameter.outer',
desc =
'Goto next parameter', },
200 + [
'[f'] = {
query =
'@call.outer',
desc =
'Goto previous function call', },
201 + [
'[m'] = {
query =
'@function.outer',
desc =
'Goto previous function definition', },
202 + [
'[c'] = {
query =
'@class.outer',
desc =
'goto previous class', },
203 + [
'[o'] = {
query =
'@conditional.outer',
desc =
'Goto previous conditional', },
204 + [
'[p'] = {
query =
'@parameter.outer',
desc =
'Goto previous parameter', },
209 + require 'treesitter-context'.setup {
212 + min_window_height =
0,
213 + line_numbers =
true,
214 + multiline_threshold =
20,
215 + trim_scope =
'outer',
neovim/lua/std/project.lua
Modified 1 1 local debug = require 'std.dbg' 2 2 local table = require 'std.table' 3 4 local join
= table.join
4 5 local dirname
= vim.fs.dirname
5 6 local normalize
= vim.fs.normalize
neovim/spell/nerd.utf-8.add
Modified