repositories / dotfiles

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
1 1 return {
2 - {
3 - 'WhoIsSethDaniel/mason-tool-installer.nvim',
4 - opts = {
5 - ensure_installed = {
6 - 'gitleaks',
7 - 'mdslw',
8 - 'vint',
9 - },
10 - },
11 - },
13 3 'stevearc/conform.nvim',
14 4 opts = {

neovim/README.md

Modified
39 39 # todo
41 41 * remove mason
42 +* navic highlights do not fit winbar
42 43 * make highlights more visible when expanding snippets
43 -* fix bug:
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
50 -* Bug:
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
49 +* refactor mark.lua
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
53 + headache...
57 54 * use ltex-ls for markdown, code comments and commit messages
58 -* learn from
59 - <https://github.com/stevearc/dotfiles/blob/master/.config/nvim/plugin/exrc.lua>
60 - and maybe adapt `std.localrc`
61 55 * setup DAP
62 56 * nvim spell for camel case words
63 57 * add nu-check to nvim-lint
67 61 on_attach)
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
72 - outside of vim?
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 ""))
11 -; ((function_call name: (identifier) @function (#eq? @function "want")) (#set! conceal "ω"))
12 -; ((local_declaration name: (identifier) @variable (#eq? @variable "want") (#set! conceal "ω"))
1 +;; inherits: lua
2 +;; extends
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'
20 21 remap = true,
23 ---TODO: add debug.print, require, prequire
24 +--TODO: add dbg.print, require, prequire
24 25 prequire 'nvim-surround'.buffer_setup {
25 26 surrounds = {
26 27 ['R'] = {

neovim/lazy-lock.json

Modified
27 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 {
37 - underline = true,
38 - virtual_text = {
39 - severity = { min = diagnostic.severity.WARN, },
40 - source = false,
41 - spacing = 2,
42 - prefix = '⦿ ',
43 - format = diagnostic_format,
44 - },
45 - float = {
46 - focusable = false,
47 - style = 'minimal',
48 - border = vim.g.border_style,
49 - source = 'if_many',
50 - header = 'Diagnostic',
51 - prefix = prefix_format,
52 - },
53 - update_in_insert = false,
54 - signs = true,
55 - severity_sort = true,
37 + underline = true,
38 + virtual_text = {
39 + severity = { min = diagnostic.severity.WARN },
40 + source = false,
41 + spacing = 2,
42 + prefix = '⦿ ',
43 + format = diagnostic_format,
44 + },
45 + float = {
46 + focusable = false,
47 + style = 'minimal',
48 + source = 'if_many',
49 + header = 'Diagnostic',
50 + prefix = prefix_format,
51 + },
52 + update_in_insert = false,
53 + signs = true,
54 + severity_sort = true,
58 57 local sign = function ( options )

neovim/lua/bugabinga/lsp/clients/java.lua

Modified
107 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'
17 +-- treat words separated by a dash as one word. used in snail-case-convention
18 +vim.opt.iskeyword:append '-'
17 20 -- Tabs and Spaces, i like 'em 2 spaces wide
18 21 -- only insert spaces for tabs if language configuration explicitly declares so
19 22 vim.opt.expandtab = false

neovim/lua/bugabinga/options/ui.lua

Modified
100 100 vim.opt.pumblend = 0
101 101 vim.opt.winblend = 0
103 +-- use this in various places for consistent border style
103 104 vim.g.border_style = 'solid'
105 106 -- hide the mode indicator in status

neovim/lua/bugabinga/plugins/fidget.lua

Modified
3 3 local debug = require 'std.dbg'
5 5 return {
6 6 'j-hui/fidget.nvim',
7 7 version = '1.*',
8 - event = 'VeryLazy',
8 + event = 'LspAttach',
9 9 opts = {
10 10 progress = {
11 11 poll_rate = 500, -- How and when to poll for progress messages

neovim/lua/bugabinga/plugins/genghis.lua

Modified
78 78 'Duplicate',
79 79 'Rename',
80 80 'Move',
81 + 'MoveToFolderInCwd',
81 82 'Trash',
82 83 'CopyFilename',
83 84 'CopyFilepath',
85 + 'CopyFilepathWithTilde',
84 86 'CopyRelativePath',
85 87 'CopyDirectoryPath',
86 88 'CopyRelativeDirectoryPath',

neovim/lua/bugabinga/plugins/lint.lua

Modified
11 11 linters_by_ft = {
12 12 lua = { 'luacheck', },
13 13 sh = { 'shellcheck', },
14 - vim = { 'vint', },
14 + nu = { 'nu-check', },
16 16 linters = {},

neovim/lua/bugabinga/plugins/mason.lua

Modified
1 1 return {
2 - "williamboman/mason.nvim",
3 - version = "1.*",
2 + 'williamboman/mason.nvim',
3 + version = '1.*',
4 4 lazy = false,
5 5 opts = {
6 6 ui = {
12 12 dependencies = {
14 - "WhoIsSethDaniel/mason-tool-installer.nvim",
14 + 'WhoIsSethDaniel/mason-tool-installer.nvim',
15 15 lazy = false,
16 16 opts = {
17 17 ensure_installed = {
18 - "lua-language-server",
19 - "shellcheck",
20 - "editorconfig-checker",
21 - "shfmt",
22 - "jdtls",
23 - "java-test",
24 - "java-debug-adapter",
25 - "lemminx",
26 - "marksman",
27 - "typos",
18 + 'lua-language-server',
19 + 'shellcheck',
20 + 'editorconfig-checker',
21 + 'shfmt',
22 + 'jdtls',
23 + 'java-test',
24 + 'java-debug-adapter',
25 + 'lemminx',
26 + 'marksman',
27 + 'typos',
28 + 'gitleaks',
29 + 'mdslw',

neovim/lua/bugabinga/plugins/neogen.lua

Modified
28 28 command = function () require 'neogen'.generate { type = 'class', } end,
31 +map.normal {
32 + description = 'Doc Comment for Type',
33 + category = 'generate',
34 + keys = '<leader>gdt',
35 + command = function () require 'neogen'.generate { type = 'type', } end,
31 38 return {
32 39 'danymat/neogen',
33 40 dependencies = { 'nvim-treesitter/nvim-treesitter', },
34 - opts = {},
41 + opts = {
42 + snippet_engine = 'luasnip',
43 + },

neovim/lua/bugabinga/plugins/oil.lua

Modified
9 9 command = function () require 'oil'.open() end,
12 +map.normal {
13 + description = 'Open parent directory in a float.',
14 + category = 'files',
15 + keys = '--',
16 + command = function () require 'oil'.open_float() end,
12 19 return {
13 20 'stevearc/oil.nvim',
14 21 lazy = false,

neovim/lua/bugabinga/plugins/text-case.lua

Added
new file mode 100644
1 +return {
2 + 'johmsalas/text-case.nvim',
3 + dependencies = { 'nvim-telescope/telescope.nvim', },
4 + config = function ()
5 + require 'textcase'.setup {}
6 + require 'telescope'.load_extension 'textcase'
7 + end,
8 + keys = {
9 + 'ga', -- Default invocation prefix
10 + { 'gA', '<cmd>TextCaseOpenTelescope<CR>', mode = { 'n', 'x', }, desc = 'Telescope', },
11 + },
12 + cmd = {
13 + 'TextCaseOpenTelescope',
14 + 'TextCaseOpenTelescopeQuickChange',
15 + 'TextCaseOpenTelescopeLSPChange',
16 + 'TextCaseStartReplacingCommand',
17 + },
18 + -- If you want to use the interactive feature of the `Subs` command right away, text-case.nvim
19 + -- has to be loaded on startup. Otherwise, the interactive feature of the `Subs` will only be
20 + -- available after the first executing of it or after a keymap of text-case.nvim has been used.
21 + lazy = false,

neovim/lua/bugabinga/plugins/tree.lua

Modified
1 1 local map = require 'std.map'
3 3 map.normal {
4 - description = 'Toggle Tree File Explorer',
5 - category = 'explorer',
6 - keys = '<leader>e',
7 - command = function () require 'nvim-tree.api'.tree.toggle() end,
4 + description = 'Toggle Tree File Explorer',
5 + category = 'explorer',
6 + keys = '<leader>e',
7 + command = function () require 'nvim-tree.api'.tree.toggle() end,
10 10 return {
11 - 'nvim-tree/nvim-tree.lua',
12 - version = '1.*',
13 - cmd = 'NvimTreeOpen',
14 - dependencies = {
15 - 'nvim-tree/nvim-web-devicons',
16 - 'antosha417/nvim-lsp-file-operations',
17 - },
18 - init = function ()
19 - -- disable netrw at the very start of your init.lua
20 - vim.g.loaded_netrw = 1
21 - vim.g.loaded_netrwPlugin = 1
11 + 'nvim-tree/nvim-tree.lua',
12 + version = '1.*',
13 + -- docs do not recommend to lazy load, but it does load slowly on win32!
14 + -- lazy = false,
15 + cmd = 'NvimTreeOpen',
16 + dependencies = {
17 + 'nvim-tree/nvim-web-devicons',
18 + 'antosha417/nvim-lsp-file-operations',
19 + },
20 + init = function ()
21 + -- disable netrw at the very start of your init.lua
22 + vim.g.loaded_netrw = 1
23 + vim.g.loaded_netrwPlugin = 1
23 - -- set termguicolors to enable highlight groups
24 - vim.opt.termguicolors = true
25 - end,
26 - opts = {
27 - sort_by = 'case_sensitive',
28 - view = {
29 - width = 69,
30 - },
31 - renderer = {
32 - group_empty = true,
33 - },
34 - filters = {
35 - dotfiles = false,
36 - },
37 - },
38 - config = function ( _, opts )
39 - require 'nvim-tree'.setup( opts )
40 - require 'lsp-file-operations'.setup()
41 - end,
25 + -- set termguicolors to enable highlight groups
26 + vim.opt.termguicolors = true
27 + end,
28 + opts = {
29 + sort_by = 'case_sensitive',
30 + view = {
31 + width = 69,
32 + },
33 + renderer = {
34 + group_empty = true,
35 + },
36 + filters = {
37 + dotfiles = false,
38 + },
39 + },
40 + config = function ( _, opts )
41 + require 'nvim-tree'.setup( opts )
42 + require 'lsp-file-operations'.setup()
43 + end,

neovim/lua/bugabinga/plugins/treesitter.lua

Modified
1 1 require 'bugabinga.health'.add_dependency
2 -{
3 - name = 'CMake',
4 - name_of_executable = 'cmake',
5 -}
6 - {
7 - name_of_executable = 'make',
8 - }
9 - {
10 - name_of_executable = 'zig',
11 - }
12 - {
13 - name = 'TreeSitter CLI',
14 - name_of_executable = 'tree-sitter',
15 - }
16 - {
17 - name_of_executable = 'tar',
18 - }
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', }
20 8 return {
21 - 'nvim-treesitter/nvim-treesitter',
22 - -- version = '0.9.*',
23 - branch = 'master',
24 - -- restoring session throws errors, if this is lazy
25 - lazy = false,
26 - build = function ()
27 - require 'nvim-treesitter.install'.update { with_sync = true, }
28 - end,
29 - dependencies = {
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',
35 - },
36 - config = function ()
37 - local install = require 'nvim-treesitter.install'
38 - local configs = require 'nvim-treesitter.configs'
9 + 'nvim-treesitter/nvim-treesitter',
10 + -- version = '0.9.*',
11 + branch = 'master',
12 + -- restoring session throws errors, if this is lazy
13 + lazy = false,
14 + build = function ()
15 + require 'nvim-treesitter.install'.update { with_sync = false, }
16 + end,
17 + dependencies = {
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',
24 + },
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 --MiB
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
48 - return true
49 - end
50 - return false
51 - end
33 + local should_disable = function ( _, bufnr )
34 + local max_filesize = 5 * 1024 * 1024 --MiB
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
37 + return true
38 + end
39 + return false
40 + end
53 - ---@diagnostic disable-next-line: missing-fields
54 - configs.setup {
55 - sync_install = false,
56 - ensure_installed = {
57 - 'bash',
58 - 'c',
59 - -- https://github.com/nvim-treesitter/nvim-treesitter/issues/5389
60 - 'comment',
61 - 'diff',
62 - 'dot',
63 - 'git_config',
64 - 'gitcommit',
65 - 'gitignore',
66 - 'java',
67 - 'just',
68 - 'jsonc',
69 - 'markdown',
70 - 'markdown_inline',
71 - 'nu',
72 - 'lua',
73 - 'luap',
74 - 'luadoc',
75 - 'regex',
76 - 'vim',
77 - 'vimdoc',
78 - 'query',
79 - 'zig',
80 - },
42 + ---@diagnostic disable-next-line: missing-fields
43 + configs.setup {
44 + sync_install = false,
45 + ensure_installed = {
46 + 'bash',
47 + 'c',
48 + 'comment',
49 + 'diff',
50 + 'dot',
51 + 'dtd',
52 + 'git_config',
53 + 'gitattributes',
54 + 'gitcommit',
55 + 'gitignore',
56 + 'ini',
57 + 'java',
58 + 'just',
59 + 'jsonc',
60 + 'lua',
61 + 'luap',
62 + 'luadoc',
63 + 'markdown',
64 + 'markdown_inline',
65 + 'muttrc',
66 + 'nasm',
67 + 'nix',
68 + 'nu',
69 + 'passwd',
70 + 'pem',
71 + 'properties',
72 + 'proto',
73 + 'printf',
74 + 'query',
75 + 'regex',
76 + 'ssh_config',
77 + 'toml',
78 + 'udev',
79 + 'vim',
80 + 'vimdoc',
81 + 'xml',
82 + 'zig',
83 + },
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, },
89 - highlight = {
90 - enable = true,
91 - disable = should_disable,
92 - additional_vim_regex_highlighting = false,
93 - },
92 + highlight = {
93 + enable = true,
94 + disable = should_disable,
95 + additional_vim_regex_highlighting = false,
96 + },
95 - incremental_selection = {
96 - enable = true,
97 - disable = should_disable,
98 - keymaps = {
99 - init_selection = '<up>',
100 - node_incremental = '<up>',
101 - node_decremental = '<down>',
102 - scope_incremental = '<right>',
103 - },
104 - },
98 + incremental_selection = {
99 + enable = true,
100 + disable = should_disable,
101 + keymaps = {
102 + init_selection = '<up>',
103 + node_incremental = '<up>',
104 + node_decremental = '<down>',
105 + scope_incremental = '<right>',
106 + },
107 + },
106 - indent = { enable = true, },
109 + indent = { enable = true, },
108 - playground = {
109 - enable = true,
110 - disable = should_disable,
111 - updatetime = 25,
112 - persist_queries = false,
113 - keybindings = {
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',
121 - update = 'R',
122 - goto_node = '<cr>',
123 - show_help = '?',
124 - },
125 - },
111 + playground = {
112 + enable = true,
113 + disable = should_disable,
114 + updatetime = 25,
115 + persist_queries = false,
116 + keybindings = {
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',
124 + update = 'R',
125 + goto_node = '<cr>',
126 + show_help = '?',
127 + },
128 + },
127 - textobjects = {
128 - select = {
129 - enable = true,
130 - disable = should_disable,
131 - lookahead = true,
132 - keymaps = {
133 - ['af'] = { query = '@call.outer', desc = 'outer function call', },
134 - ['if'] = { query = '@call.inner', desc = 'inner function call', },
130 + textobjects = {
131 + select = {
132 + enable = true,
133 + disable = should_disable,
134 + lookahead = true,
135 + keymaps = {
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', },
142 - -- l overwrites builtin. i have no good idea for better binding. use ia instead.
143 - -- ['la'] = { query = '@assignment.lhs', desc = 'left hand side of assignment'},
144 - -- ['ra'] = { query = '@assignment.rhs', desc = 'right hand side of assignment'},
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', },
156 + },
157 + selection_modes = {
158 + ['@parameter.outer'] = 'v',
159 + ['@function.outer'] = 'v',
160 + ['@class.outer'] = '<c-v>',
161 + ['@scope'] = 'V',
162 + },
163 + include_surroundig_whitespace = true,
164 + },
155 - -- this overwrites the built-in 'paragraph' object
156 - ['ap'] = { query = '@parameter.outer', desc = 'outer parameter', },
157 - ['ip'] = { query = '@parameter.inner', desc = 'inner parameter', },
166 + swap = {
167 + enable = true,
168 + disable = should_disable,
169 + swap_next = {
170 + ['<leader>rwn'] = { query = '@parameter.inner', desc = 'Swap parameter with next', },
171 + },
172 + swap_previous = {
173 + ['<leader>rwp'] = { query = '@parameter.inner', desc = 'Swap parameter with previous', },
174 + },
175 + },
159 - ['at'] = { query = '@comment.outer', desc = 'outer comment', },
177 + lsp_interop = {
178 + enable = true,
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.', },
185 + },
186 + },
161 - ['as'] = { query = '@scope', query_group = 'locals', desc = 'language scope', },
162 - },
163 - selection_modes = {
164 - ['@parameter.outer'] = 'v',
165 - ['@function.outer'] = 'v',
166 - ['@class.outer'] = '<c-v>',
167 - ['@scope'] = 'V',
168 - },
169 - include_surroundig_whitespace = true,
170 - },
172 - swap = {
173 - enable = true,
174 - disable = should_disable,
175 - swap_next = {
176 - ['<leader>rwn'] = { query = '@parameter.inner', desc = 'Swap parameter with next', },
177 - },
178 - swap_previous = {
179 - ['<leader>rwp'] = { query = '@parameter.inner', desc = 'Swap parameter with previous', },
180 - },
181 - },
183 - lsp_interop = {
184 - enable = true,
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.', },
191 - },
192 - },
194 - move = {
195 - enable = true,
196 - disable = should_disable,
197 - set_jumps = true,
198 - goto_next = {
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', },
204 - },
205 - goto_previous = {
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', },
211 - },
212 - },
213 - },
214 - }
215 - end,
188 + move = {
189 + enable = true,
190 + disable = should_disable,
191 + set_jumps = true,
192 + goto_next = {
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', },
198 + },
199 + goto_previous = {
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', },
205 + },
206 + },
207 + },
209 + require 'treesitter-context'.setup {
210 + enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
211 + max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
212 + min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
213 + line_numbers = true,
214 + multiline_threshold = 20, -- Maximum number of lines to show for a single context
215 + trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
216 + mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
217 + -- Separator between context and content. Should be a single character string, like '-'.
218 + -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
219 + separator = nil,
220 + zindex = 20, -- The Z-index of the context window
221 + on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
223 + end,

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
25 25 autopairs
26 26 cterm/!
27 +navic
28 +winbar
27 29 resession
28 30 configs
29 31 BufNewFile
59 61 jdtls
60 62 href
61 63 DocumentUri
64 +sinnfrei