dotfiles
bugabingas dorkfiles
owned by bugabinga
neovim: plugin cleanups
d7dbe193daec66a835bac9d5782cf576257997fa
Oliver Jan Krylow <oliver@bugabinga.net> ·
unsigned
Browse filesCompare with HEAD
Changed files (19)
25 25 : file type specific config
41 -* navic highlights do not fit winbar
42 41 * indent line bg overwrites visual selection bg
43 -* fix bg gihlight of treesitter-context
42 +* fix bg highlight of treesitter-context
43 +* fix markdown rendering in doc popup
44 44 * make highlights more visible when expanding snippets
45 +* kill mason again and get lsps via packages.nu
46 +* simplify lsp config
47 + - make my config identical to vim.lsp.ClientConfig
48 + - fuck all that single file and workspace stuff
49 + - move start function and config creation from lsp/init.lua to ftplugin/*.lua
45 50 * make assignment to map.x fail, e.g. `map.normal = {}`...
46 51 * figure out desirable cmp key maps
47 52 * try loading lsp async for better startup perf
48 53 * check out `vim.snippet`
49 -* adapt config to respect `vim.g.nerdfont` (std.constants?)
50 -* Do I want multiple LSPs per buffer?
51 - In case of markdown and text it seems useful, for code it seems like a
53 - But it seems inevitable, because more and more tools use the LSP infrastructure.
54 - For example, grammar checkers like harper or code transform tools like ast-grep
54 +* replace cmp with vim.lsp.completion when 0.11 comes out
55 +* adapt config to respect `vim.g.nerdfont` (std.const?)
55 56 * check out harper-ls
56 57 * check out ast-grep
57 -* flesh out 'const.lua', move to std?
58 58 * nvim spell for camel case words
59 59 * create skeleton-plugin for default file content based on file type
neovim/colors/nugu.lua
Modified 3 -function get_background_based_on_os()
5 - local background
= 'light' 6 - local uname
= vim.uv.os_uname()
8 - if uname.sysname
== "Windows_NT" or string.
match(uname.release,
"WSL")
then 10 - if vim.fn.executable(
'reg.exe')
~= 0 then 12 - local appsUseLightTheme
= vim.fn.system({
"reg.exe",
"Query",
"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
"/v",
"AppsUseLightTheme"})
13 - if not appsUseLightTheme:find(
"0x1")
then 18 - elseif vim.fn.executable(
'busctl')
~= 0 then 20 - local result
= vim.fn.system({
21 - "busctl",
"--user",
"call",
"org.freedesktop.portal.Desktop",
"/org/freedesktop/portal/desktop",
22 - "org.freedesktop.portal.Settings",
"ReadOne",
"ss",
"org.freedesktop.appearance",
"color-scheme" 25 - local color_scheme
= result:match(
"u%s+(%d+)")
27 - if color_scheme
== '1' then 1 +local const
= require'std.const' 36 3 if vim.g.colors_name
== nil then 37 - vim.opt.background
= get_background_based_on_os()
4 + vim.opt.background
= const.os_background
40 7 vim.cmd
[[ highlight clear ]] neovim/ftplugin/lua.lua
Modified11 11 vim.opt_local.conceallevel
= 1 12 12 vim.opt_local.concealcursor
= 'n' 16 + 'function ${1:name}($2)\n\t${3:-- content}\nend',
21 + 'local ${1:name} = function($2)\n\t${3:-- gogogo}\nend',
14 14 vim.cmd.colorscheme
'nugu' 17 18 prequire
= require 'std.prequire' 19 -prequire
'bugabinga.options' 20 -prequire
'bugabinga.editorconfig' 21 -prequire
'bugabinga.sessions' 22 -prequire
'bugabinga.lazy' 23 -prequire
'bugabinga.save_actions' 25 -prequire
'bugabinga.lsp' 22 +require 'bugabinga.options' 23 +require 'bugabinga.editorconfig' 24 +require 'bugabinga.sessions' 25 +require 'bugabinga.lazy' 27 -vim.defer_fn (
function ()
28 - prequire
'bugabinga.terminal' 29 - prequire
'bugabinga.diagnostic' 27 +require 'bugabinga.lsp' 29 +vim.defer_fn(
function ()
30 + require 'bugabinga.terminal' 31 + require 'bugabinga.diagnostic' 32 + require 'bugabinga.save_actions' 33 + require 'bugabinga.lsp.lightbulb' 2 2 set shell := [
'nu',
'--commands']
14 - nvim --headless
"+Lazy! sync" +qa
14 + nvim --headless
"+Lazy! sync" +qa
20 + --tree=$HOME/.local/share/nvim/rocks \
19 - rm -r (run-external --redirect-combine nvim
"--headless" "-n" "-R" +
'lua = vim.fn.stdpath[[data]]' +:q | lines | last)
20 - rm -r (run-external --redirect-combine nvim
"--headless" "-n" "-R" +
'lua = vim.fn.stdpath[[cache]]' +:q | lines | last)
21 - rm -r (run-external --redirect-combine nvim
"--headless" "-n" "-R" +
'lua = vim.fn.stdpath[[state]]' +:q | lines | last)
26 + rm -r (run-external --redirect-combine nvim
"--headless" "-n" "-R" +
'lua = vim.fn.stdpath[[data]]' +:q | lines | last)
27 + rm -r (run-external --redirect-combine nvim
"--headless" "-n" "-R" +
'lua = vim.fn.stdpath[[cache]]' +:q | lines | last)
28 + rm -r (run-external --redirect-combine nvim
"--headless" "-n" "-R" +
'lua = vim.fn.stdpath[[state]]' +:q | lines | last)
neovim/lazy-lock.json
Modified 5 5 "Comment.nvim": {
"branch":
"master",
"commit":
"e51f2b142d88bb666dcaa77d93a07f4b419aca70" },
6 6 "LuaSnip": {
"branch":
"master",
"commit":
"03c8e67eb7293c404845b3982db895d59c0d1538" },
7 7 "better-escape.nvim": {
"branch":
"master",
"commit":
"f45b52f8f87792e8659526f23261ffe278a54be5" },
8 8 "cmp-buffer": {
"branch":
"main",
"commit":
"3022dbc9166796b644a841a02de8dd1cc1d311fa" },
9 9 "cmp-nvim-lsp": {
"branch":
"main",
"commit":
"39e2eda76828d88b773cc27a3f61d2ad782c922d" },
10 + "cmp-nvim-lsp-signature-help": {
"branch":
"main",
"commit":
"031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
10 11 "cmp-nvim-lua": {
"branch":
"main",
"commit":
"f12408bdb54c39c23e67cab726264c10db33ada8" },
11 12 "cmp-path": {
"branch":
"main",
"commit":
"91ff86cd9c29299a64f968ebb45846c485725f23" },
12 13 "cmp_luasnip": {
"branch":
"master",
"commit":
"05a9ab28b53f71d1aece421ef32fee2cb857a843" },
13 14 "colorizer.nvim": {
"branch":
"master",
"commit":
"c1602ff3f11566bb7f16f90985b0c59d3d7db0ef" },
14 - "conform.nvim": {
"branch":
"master",
"commit":
"1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" },
15 + "conform.nvim": {
"branch":
"master",
"commit":
"50649648851cd0e126dfedd0f3c33b900a6f1ef8" },
16 + "decisive.nvim": {
"branch":
"main",
"commit":
"a7251adebccbc9c899cff39a524b20d06e2b78b5" },
15 17 "diffview.nvim": {
"branch":
"main",
"commit":
"4516612fe98ff56ae0415a259ff6361a89419b0a" },
16 18 "dressing.nvim": {
"branch":
"master",
"commit":
"1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
17 19 "flash.nvim": {
"branch":
"main",
"commit":
"ec0bf2842189f65f60fd40bf3557cac1029cc932" },
18 - "heirline.nvim": {
"branch":
"master",
"commit":
"0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
20 + "heirline.nvim": {
"branch":
"master",
"commit":
"7a79753c1a42c3f52e89a6c42429e7f871e560cd" },
21 + "in-and-out.nvim": {
"branch":
"master",
"commit":
"ab24cafadc3418dffb0c7e9b0621cff60b9ac551" },
19 22 "indent-blankline.nvim": {
"branch":
"master",
"commit":
"3fe94b8034dd5241cb882bb73847303b58857ecf" },
23 + "ivy.nvim": {
"branch":
"0.x",
"commit":
"cfa7e29ae4d955508d4f7f2ef08cc0c51ee745ed" },
20 24 "lazy.nvim": {
"branch":
"main",
"commit":
"460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
21 25 "lspkind.nvim": {
"branch":
"master",
"commit":
"59c3f419af48a2ffb2320cea85e44e5a95f71664" },
22 - "mason.nvim": {
"branch":
"main",
"commit":
"e2f7f9044ec30067bc11800a9e266664b88cda22" },
26 + "markdown-table-mode.nvim": {
"branch":
"main",
"commit":
"f830cd15a97deb3acc53d9f6607bc609f7f32e49" },
27 + "mason.nvim": {
"branch":
"main",
"commit":
"c43eeb5614a09dc17c03a7fb49de2e05de203924" },
23 28 "mini.bracketed": {
"branch":
"main",
"commit":
"833d66df6e0588222312a963780c6ec42ed7437d" },
24 29 "mini.bufremove": {
"branch":
"main",
"commit":
"1ee294a97e091d3cf967974df622c0d887890dc2" },
25 30 "mkdir.nvim": {
"branch":
"main",
"commit":
"c55d1dee4f099528a1853b28bb28caa802eba217" },
27 32 "nvim-gomove": {
"branch":
"main",
"commit":
"2b44ae7ac0804f4e3959228122f7c85bef1964e3" },
28 33 "nvim-lastplace": {
"branch":
"main",
"commit":
"0bb6103c506315044872e0f84b1f736c4172bb20" },
29 34 "nvim-lint": {
"branch":
"master",
"commit":
"968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" },
35 + "nvim-lsp-endhints": {
"branch":
"main",
"commit":
"391ef40521b631a8a2fb7aef78db6967ead6b39d" },
30 36 "nvim-neoclip.lua": {
"branch":
"main",
"commit":
"32e05f2d23dc5b6a284a688c0535a83d1bfc633f" },
31 37 "nvim-surround": {
"branch":
"main",
"commit":
"ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
32 - "nvim-treesitter": {
"branch":
"master",
"commit":
"679883ad31f1752cac92a4ca182cee8b2751d4f1" },
38 + "nvim-treesitter": {
"branch":
"master",
"commit":
"f027762845fa35ff27fe0487c86537a74a480a0c" },
33 39 "nvim-treesitter-endwise": {
"branch":
"master",
"commit":
"8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
34 - "nvim-treesitter-textobjects": {
"branch":
"master",
"commit":
"bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" },
40 + "nvim-treesitter-textobjects": {
"branch":
"master",
"commit":
"4a2d05ec24eaa6b655c7d19092a3b6c0219d46b9" },
35 41 "nvim-ts-autotag": {
"branch":
"main",
"commit":
"e239a560f338be31337e7abc3ee42515daf23f5e" },
36 42 "nvim-web-devicons": {
"branch":
"master",
"commit":
"26220156aafb198b2de6a4cf80c1b120a3768da0" },
37 43 "oil.nvim": {
"branch":
"master",
"commit":
"1eb9fb35a4613518f79790117ed82c367a0b4a22" },
38 44 "plenary.nvim": {
"branch":
"master",
"commit":
"2d9b06177a975543726ce5c73fca176cedbffe9d" },
45 + "precognition.nvim": {
"branch":
"main",
"commit":
"8a81c310b4e76b4884fc5350a5741cf683c645c7" },
46 + "scratch.nvim": {
"branch":
"main",
"commit":
"3e3d2ad0d7f565bc794d9d3ad40e92509802ecad" },
39 47 "specs.nvim": {
"branch":
"main",
"commit":
"8a108c8b37dec1b184a1d3d76c6cf867bfbe9636" },
48 + "spellwarn.nvim": {
"branch":
"main",
"commit":
"2f4dbc58bb90bc63b295461216b91ccf4e7f782d" },
40 49 "substitute.nvim": {
"branch":
"main",
"commit":
"17ffaeb5a1dc2dbef39cf0865d8a4b6000836714" },
50 + "telescope-frecency.nvim": {
"branch":
"master",
"commit":
"f67baca08423a6fd00167801a54db38e0b878063" },
41 51 "telescope-fzf-native.nvim": {
"branch":
"main",
"commit":
"cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
42 52 "telescope-symbols.nvim": {
"branch":
"master",
"commit":
"a6d0127a53d39b9fc2af75bd169d288166118aec" },
43 53 "telescope-zoxide": {
"branch":
"main",
"commit":
"54bfe630bad08dc9891ec78c7cf8db38dd725c97" },
44 54 "telescope.nvim": {
"branch":
"master",
"commit":
"a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
45 55 "text-case.nvim": {
"branch":
"main",
"commit":
"13daf28a829e6d0646904c94214cb289bb0c6f34" },
56 + "timespent.nvim": {
"branch":
"master",
"commit":
"6346ea9556344a44fdbc83a8a80d68ca66dd8778" },
57 + "tiny-inline-diagnostic.nvim": {
"branch":
"main",
"commit":
"1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7" },
46 58 "todo-comments.nvim": {
"branch":
"main",
"commit":
"ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
59 + "toggle.nvim": {
"branch":
"main",
"commit":
"50769ba8982d3d3a8fbd1d1a2e5cad63c73df662" },
47 60 "tree-sitter-nu": {
"branch":
"main",
"commit":
"e3b4c967937cad628dca09bd098cd780d8288750" },
48 61 "treesj": {
"branch":
"main",
"commit":
"0d81326b5afd36babe7dd480aabbb0b05f33e688" },
49 62 "vim-vscode-snippets": {
"branch":
"master",
"commit":
"c34e9edee6a00cf3d0b8edb515e08e3df450bcfa" },
neovim/lua/bugabinga/const.lua
Deleteddeleted file mode 1006443 - win32 = vim.loop.os_uname().sysname:match
'Win',
4 - wsl2 = vim.loop.os_uname().release:match
'WSL2',
neovim/lua/bugabinga/lsp/init.lua
Modified 15 -require 'bugabinga.lsp.lightbulb' 17 16 local token_update = function ( lsp_client )
18 17 local token
= lsp_client.data.token
301 300 keys
= '<leader>ti',
302 301 command = function ()
303 - vim.lsp.inlay_hint.enable( bufnr,
nil )
302 + vim.lsp.inlay_hint.enable( vim.lsp.inlay_hint.is_enabled() )
neovim/lua/bugabinga/options/behaviour.lua
Modified 1 1 local debug = require 'std.dbg' 2 +local const
= require 'std.const' 2 3 local auto
= require 'std.auto' 55 56 vim.opt.mousemodel
= 'extend' 59 -vim.opt.shellcmdflag
= '--stdin --no-newline --commands' 60 -vim.opt.shellredir
= 'out+err> %s' 61 -vim.opt.shellpipe
= '| complete | update stderr { ansi strip } | tee { get stderr | save --force --raw %s} | into record' 62 -vim.opt.shelltemp
= false 63 -vim.opt.shellxquote
= '' 64 -vim.opt.shellxescape
= '' 65 -vim.opt.shellquote
= '' 58 +if vim.fn.executable
'nu' then 60 + vim.opt.shell
= 'nu' 65 + vim.opt.shellcmdflag
= '--stdin --no-newline --commands' 70 + vim.opt.shellredir
= 'out+err> "%s"' 76 + '| complete | get stderr stdout | str join (char nl) | ansi strip | tee { save --force --raw "%s" }' 82 + vim.opt.shelltemp
= false 83 + vim.opt.shellxquote
= '' 84 + vim.opt.shellxescape
= '' 85 + vim.opt.shellquote
= '' 67 88 require 'bugabinga.health'.add_dependency
83 104 vim.opt.inccommand
= 'nosplit' 86 -vim.opt.grepprg
= 'rg --hidden --vimgrep --no-heading --smart-case --' 87 -vim.opt.grepformat
= '%f:%l:%c:%m' 106 +if vim.fn.executable
'rg' then 108 + vim.opt.grepprg
= 'rg --hidden --vimgrep --no-heading --smart-case -- ' 109 + vim.opt.grepformat
= '%f:%l:%c:%m' 89 112 require 'bugabinga.health'.add_dependency
96 119 vim.opt.confirm
= true 122 + vim.g.clipboard
= {
123 + name =
'WslClipboard',
125 + [
'+'] =
'clip.exe',
126 + [
'*'] =
'clip.exe',
129 + [
'+'] =
'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
130 + [
'*'] =
'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
neovim/lua/bugabinga/options/keymaps.lua
Modified 1 1 local map
= require 'std.map' 2 -local const
= require 'bugabinga.const' 2 +local const
= require 'std.const' 3 3 local togglers
= require 'bugabinga.options.togglers' neovim/lua/bugabinga/options/ui.lua
Modified 13 13 auto
'disable_columns_in_special_buffers' {
14 14 description =
'Hide columns in buffers, that do not show source code.',
15 - events = {
'FileType', },
15 + events = {
'FileType' },
16 16 pattern = ignored.filetypes,
17 17 command =
function ()
18 18 dbg.print
'Hiding columns in buffers without source code' 90 90 vim.opt.foldenable
= false 93 -vim.opt.colorcolumn
= {
'80',
'120',
'140', }
93 +vim.opt.colorcolumn
= {
'80',
'120',
'140' }
96 96 vim.opt.cursorline
= false neovim/lua/bugabinga/plugins/bracketed.lua
Modified3 3 'echasnovski/mini.bracketed',
7 + treesitter = {
suffix =
'' },
8 + window = {
suffix =
'' },
9 + yank = {
suffix =
'' },
10 + indent = {
suffix =
'' },
11 + comment = {
suffix =
'' },
neovim/lua/bugabinga/plugins/cmp.lua
Modified 11 11 'hrsh7th/cmp-buffer',
12 12 'hrsh7th/cmp-path',
13 13 'hrsh7th/cmp-nvim-lua',
14 + 'hrsh7th/cmp-nvim-lsp-signature-help',
14 15 'saadparwaiz1/cmp_luasnip',
15 16 'onsails/lspkind.nvim',
16 17 'L3MON4D3/LuaSnip',
95 96 {
name =
'nvim_lua' },
97 + {
name =
'nvim_lsp_signature_help' },
96 98 {
name =
'nvim_lsp' },
98 100 {
name =
'luasnip' },
neovim/lua/bugabinga/plugins/conform.lua
Modified25 25 cmd
= {
'ConformInfo' },
27 27 formatters_by_ft = {
29 - markdown = {
'mdslw' },
31 28 toml = {
'taplo' },
35 31 zig = {
'zigfmt' },
37 33 [
'*'] = {
'injected',
'typos' },
40 36 [
'_']
= {
'trim_whitespace',
'trim_newlines' },
48 38 log_level
= debug.get()
and vim.log.levels.TRACE
or vim.log.levels.INFO,
neovim/lua/bugabinga/plugins/genghis.lua
Modified 1 -local const
= require 'bugabinga.const' 1 +local const
= require 'std.const' 3 3 require 'bugabinga.health'.add_dependency {
4 4 name_of_executable =
'recycle-bin',
neovim/lua/bugabinga/plugins/todo-comments.lua
Modified 1 +local map
= require 'std.map' 4 + description =
'Next todo comment',
5 + category =
'navigation',
7 + command =
function ()
8 + require 'todo-comments'.jump_next()
13 + description =
'Previous todo comment',
14 + category =
'navigation',
16 + command =
function ()
17 + require 'todo-comments'.jump_prev()
22 + description =
'Show TODOs',
23 + category =
'navigation',
25 + command =
'<cmd>TodoQuickFix<cr>',
2 29 'folke/todo-comments.nvim',
4 - dependencies = {
'nvim-lua/plenary.nvim', },
32 + dependencies = {
'nvim-lua/plenary.nvim' },
neovim/lua/bugabinga/save_actions.lua
Modified10 10 vim.iter( all_actions ):each(
11 11 function ( action )
13 - action = { action,
'string', },
13 + action = { action,
'string' },
15 15 local parsed_command
= vim.api.nvim_parse_cmd( action, {} )
16 - vim.api.nvim_cmd( parsed_command, {
output =
true, } )
16 + vim.api.nvim_cmd( parsed_command, {
output =
true } )
neovim/lua/bugabinga/sessions.lua
Modified 4 4 local map
= require 'std.map' 5 5 local auto
= require 'std.auto' 7 7 local sessions
= vim.fs.normalize( vim.fn.stdpath
'data' .. '/sessions' )
8 8 vim.fn.mkdir( sessions,
'p' )
11 10 local file_exists = function ( path )
12 11 local stat
= vim.uv.fs_stat( path )
14 13 local encode = function ( data )
15 - vim.validate {
data = { data,
'string', }, }
14 + vim.validate {
data = { data,
'string' } }
18 17 return vim.base64.encode( data ):gsub(
'%+',
'-' ):gsub(
'%/',
'.' ):gsub(
'%=',
'_' )
21 20 local decode = function ( data )
22 - vim.validate {
data = { data,
'string', }, }
21 + vim.validate {
data = { data,
'string' } }
23 22 return vim.base64.decode( data:gsub(
'%-',
'+' ):gsub(
'%.',
'/' ):gsub(
'%_',
'=' )
33 32 local save_session_for_cwd = function ()
34 33 local cwd
= vim.uv.cwd()
35 34 local session_save_path
= to_session_path( cwd )
36 - vim.cmd.mksession { session_save_path,
bang =
true, }
35 + vim.cmd.mksession { session_save_path,
bang =
true }
39 38 local load_session = function ( session )
40 39 local session_path
= vim.fs.normalize( sessions
.. '/' .. session )
42 41 if file_exists( session_path )
then 43 - vim.cmd.source { session_path, }
42 + vim.cmd.source { session_path }
45 44 vim.notify(
'No session `' .. session
.. '` found!' )
neovim/lua/std/icon.lua
Modified