diff options
| author | Eugene Triguba <hello@eugenetriguba.com> | 2026-03-26 18:14:31 -0400 |
|---|---|---|
| committer | Eugene Triguba <hello@eugenetriguba.com> | 2026-03-26 18:14:31 -0400 |
| commit | 812b44f324d988b3c23df83bac5b804cfbdd93fb (patch) | |
| tree | a3ccb9ad4b1c1565108abf13d1415672341ed241 | |
| parent | Add nord colorscheme for nvim (diff) | |
| download | dotfiles-812b44f324d988b3c23df83bac5b804cfbdd93fb.zip | |
Update nvim config
19 files changed, 392 insertions, 189 deletions
diff --git a/.config/nvim/after/ftdetect/tiger.lua b/.config/nvim/after/ftdetect/tiger.lua deleted file mode 100644 index 6c84a55..0000000 --- a/.config/nvim/after/ftdetect/tiger.lua +++ /dev/null @@ -1,5 +0,0 @@ -vim.filetype.add { - extension = { - tiger = 'tiger', - }, -} diff --git a/.config/nvim/after/ftdetect/tpl.lua b/.config/nvim/after/ftdetect/tpl.lua deleted file mode 100644 index f1ec161..0000000 --- a/.config/nvim/after/ftdetect/tpl.lua +++ /dev/null @@ -1,6 +0,0 @@ -vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, { - pattern = '*.sh.tpl', - callback = function() - vim.bo.filetype = 'sh' - end, -}) diff --git a/.config/nvim/after/ftplugin/markdown.lua b/.config/nvim/after/ftplugin/markdown.lua index 4f56524..6d32106 100644 --- a/.config/nvim/after/ftplugin/markdown.lua +++ b/.config/nvim/after/ftplugin/markdown.lua @@ -10,6 +10,7 @@ opt_local.breakindent = true opt_local.spell = true opt_local.spelllang = 'en_us' +opt_local.spellcapcheck = '' opt_local.expandtab = true opt_local.tabstop = 2 @@ -17,3 +18,9 @@ opt_local.shiftwidth = 2 opt_local.list = true opt_local.listchars = 'tab:»·,trail:·' + +opt_local.number = false +opt_local.relativenumber = false + +-- Use macOS dictionary program as keyword look up +opt_local.keywordprg = 'open-dict' diff --git a/.config/nvim/lua/eugenetriguba/keymaps.lua b/.config/nvim/lua/eugenetriguba/keymaps.lua index 077130a..68c8281 100644 --- a/.config/nvim/lua/eugenetriguba/keymaps.lua +++ b/.config/nvim/lua/eugenetriguba/keymaps.lua @@ -33,23 +33,3 @@ vim.keymap.set('n', '<leader>bd', '<cmd>bdelete<cr>', { desc = 'Delete current b vim.keymap.set('n', '<leader>bD', '<cmd>bdelete!<cr>', { desc = 'Force delete current buffer' }) -- Delete all buffers except the current one vim.keymap.set('n', '<leader>ba', ':%bd|e#<cr>', { desc = 'Delete all other buffers' }) - -map('n', '<leader>rdt', function() - local func_name = vim.fn.expand '<cword>' - local output = vim.fn.systemlist('django-test --list ' .. func_name) - if #output == 0 then - vim.notify('No tests found for: ' .. func_name, vim.log.levels.WARN) - elseif #output == 1 then - -- Single match, run directly - vim.cmd('split | terminal ' .. output[1]) - else - -- Multiple matches, prompt user - vim.ui.select(output, { - prompt = 'Select test to run:', - }, function(choice) - if choice then - vim.cmd('split | terminal ' .. choice) - end - end) - end -end, { desc = '[R]un [D]jango [T]est for word under cursor' }) diff --git a/.config/nvim/lua/eugenetriguba/plugins/blink.lua b/.config/nvim/lua/eugenetriguba/plugins/blink.lua index 16b5310..30de968 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/blink.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/blink.lua @@ -1,8 +1,26 @@ +vim.api.nvim_create_autocmd('PackChanged', { + callback = function(args) + local spec = args.data.spec + if spec and spec.name == 'blink.cmp' then + if args.data.kind == 'install' or args.data.kind == 'update' then + vim.notify('Building blink.cmp...', vim.log.levels.INFO) + vim.system({ 'cargo', 'build', '--release' }, { cwd = spec.path, text = true }, function(result) + if result.code == 0 then + vim.notify('blink.cmp build successful!', vim.log.levels.INFO) + else + vim.notify('blink.cmp build failed: ' .. (result.stderr or ''), vim.log.levels.ERROR) + end + end) + end + end + end, +}) + vim.pack.add { { name = 'blink.cmp', src = 'https://github.com/saghen/blink.cmp', - version = 'v1.8.0', + version = 'v1.10.1', }, { name = 'LuaSnip', @@ -17,23 +35,7 @@ vim.pack.add { src = 'https://github.com/folke/lazydev.nvim', }, } -vim.api.nvim_create_autocmd('PackChanged', { - callback = function(args) - local spec = args.data.spec - if spec and spec.name == 'blink.cmp' then - if args.data.kind == 'install' or args.data.kind == 'update' then - vim.notify('Building blink.cmp...', vim.log.levels.INFO) - vim.system({ 'cargo', '+nightly', 'build', '--release' }, { cwd = spec.path, text = true }, function(result) - if result.code == 0 then - vim.notify('blink.cmp build successful!', vim.log.levels.INFO) - else - vim.notify('blink.cmp build failed: ' .. (result.stderr or ''), vim.log.levels.ERROR) - end - end) - end - end - end, -}) + require('luasnip.loaders.from_vscode').lazy_load() require('blink.cmp').setup { keymap = { diff --git a/.config/nvim/lua/eugenetriguba/plugins/conform.lua b/.config/nvim/lua/eugenetriguba/plugins/conform.lua index aae35be..68112d2 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/conform.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/conform.lua @@ -23,24 +23,26 @@ require('conform').setup { end, formatters_by_ft = { c = { 'clang-format' }, + cpp = { 'clang-format' }, lua = { 'stylua' }, go = { 'gofmt' }, python = { 'black', 'isort' }, rust = { 'rustfmt' }, sh = { 'shfmt' }, - md = { 'prettierd', 'prettier', stop_after_first = true }, - yaml = { 'prettierd', 'prettier', stop_after_first = true }, - json = { 'prettierd', 'prettier', stop_after_first = true }, - javascript = { 'prettierd', 'prettier', stop_after_first = true }, - typescript = { 'prettierd', 'prettier', stop_after_first = true }, - javascriptreact = { 'prettierd', 'prettier', stop_after_first = true }, - typescriptreact = { 'prettierd', 'prettier', stop_after_first = true }, - css = { 'prettierd', 'prettier', stop_after_first = true }, - htmldjango = { 'prettierd', 'prettier', stop_after_first = true }, - html = { 'prettierd', 'prettier', stop_after_first = true }, tf = { 'terraform_fmt' }, nix = { 'nixfmt' }, java = { 'google-java-format' }, + md = { 'prettierd' }, + toml = { 'taplo' }, + yaml = { 'prettierd' }, + json = { 'prettierd' }, + javascript = { 'prettierd' }, + typescript = { 'prettierd' }, + javascriptreact = { 'prettierd' }, + typescriptreact = { 'prettierd' }, + css = { 'prettierd' }, + htmldjango = { 'prettierd' }, + html = { 'prettierd' }, }, formatters = { isort = { @@ -84,9 +86,9 @@ vim.keymap.set('n', '<leader>tf', function() end end, { desc = 'Toggle autoformat for current buffer' }) +-- If autoformat is currently disabled globally, +-- then enable it globally, otherwise disable it globally vim.keymap.set('n', '<leader>tF', function() - -- If autoformat is currently disabled globally, - -- then enable it globally, otherwise disable it globally if vim.g.disable_autoformat then vim.cmd 'FormatEnable' vim.notify 'Enabled autoformat globally' diff --git a/.config/nvim/lua/eugenetriguba/plugins/conjure.lua b/.config/nvim/lua/eugenetriguba/plugins/conjure.lua new file mode 100644 index 0000000..30de08a --- /dev/null +++ b/.config/nvim/lua/eugenetriguba/plugins/conjure.lua @@ -0,0 +1,29 @@ +-- Remap the documentation word mapping so it doesn't conflict +-- with our LSP mapping. +vim.g['conjure#mapping#doc_word'] = 'gk' + +-- Only use conjure for certain languages. +vim.g['conjure#filetype'] = { 'scheme', 'lisp', 'fennel', 'lua', 'cl' } + +-- Map .lisp and .cl files to the Common Lisp swank client, not nREPL. +vim.g['conjure#filetype#cl'] = 'conjure.client.common-lisp.swank' +vim.g['conjure#filetype#lisp'] = 'conjure.client.common-lisp.swank' + +vim.api.nvim_create_autocmd('FileType', { + pattern = vim.g['conjure#filetype'], + once = true, + callback = function() + vim.pack.add { + { + name = 'conjure', + src = 'https://github.com/Olical/conjure', + version = 'v4.59.0', + }, + { + name = 'parinfer-rust', + src = 'https://github.com/eraserhd/parinfer-rust', + version = 'master', + }, + } + end, +}) diff --git a/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua b/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua index fcb5190..2eea4f7 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua @@ -8,6 +8,7 @@ vim.pack.add { src = 'https://github.com/ibhagwan/fzf-lua', }, } + require('fzf-lua').setup { winopts = { preview = { @@ -27,6 +28,7 @@ require('fzf-lua').setup { rg_grep = true, }, } + local fzf = require 'fzf-lua' vim.keymap.set('n', '<leader>fh', fzf.helptags, { desc = '[F]ind [H]elp' }) vim.keymap.set('n', '<leader>fk', fzf.keymaps, { desc = '[F]ind [K]eymaps' }) diff --git a/.config/nvim/lua/eugenetriguba/plugins/init.lua b/.config/nvim/lua/eugenetriguba/plugins/init.lua index 4192055..cd5a36c 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/init.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/init.lua @@ -7,8 +7,12 @@ require 'eugenetriguba.plugins.fzf-lua' require 'eugenetriguba.plugins.lazygit' require 'eugenetriguba.plugins.gitsigns' require 'eugenetriguba.plugins.harpoon' +require 'eugenetriguba.plugins.markdown' +require 'eugenetriguba.plugins.trouble' +require 'eugenetriguba.plugins.conjure' +require 'eugenetriguba.plugins.mason' require 'eugenetriguba.plugins.nvim-lint' require 'eugenetriguba.plugins.conform' -require 'eugenetriguba.plugins.trouble' require 'eugenetriguba.plugins.blink' require 'eugenetriguba.plugins.lsp' +require 'eugenetriguba.plugins.nvim-dap' diff --git a/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua b/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua index 7dbf1de..9e4abe3 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua @@ -8,4 +8,5 @@ vim.pack.add { src = 'https://github.com/nvim-lua/plenary.nvim', }, } + vim.keymap.set('n', '<leader>tg', '<cmd>LazyGit<cr>', { desc = '[T]oggle Lazy[G]it' }) diff --git a/.config/nvim/lua/eugenetriguba/plugins/lsp.lua b/.config/nvim/lua/eugenetriguba/plugins/lsp.lua index 0415fc8..e4864a3 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/lsp.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/lsp.lua @@ -8,32 +8,27 @@ vim.pack.add { src = 'https://github.com/neovim/nvim-lspconfig', }, { - name = 'mason.nvim', - src = 'https://github.com/williamboman/mason.nvim', - }, - { - name = 'mason-lspconfig.nvim', - src = 'https://github.com/williamboman/mason-lspconfig.nvim', - }, - { - name = 'mason-tool-installer.nvim', - src = 'https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim', - }, - { name = 'fidget.nvim', src = 'https://github.com/j-hui/fidget.nvim', }, } --- Lazydev for Lua development +require('fidget').setup {} require('lazydev').setup { + enabled = function(root_dir) + local lazydev_enabled = function() + return vim.g.lazydev_enabled == nil and true or vim.g.lazydev_enabled + end + local is_lua_neovim_config_file = function() + return vim.bo.filetype == 'lua' and vim.fn.expand('%:p'):find(vim.fn.stdpath 'config', 1, true) ~= nil + end + return lazydev_enabled() or is_lua_neovim_config_file() + end, library = { { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, }, } --- Fidget for LSP progress -require('fidget').setup {} -require('mason').setup() + vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('lsp-attach', { clear = true }), callback = function(event) @@ -43,8 +38,9 @@ vim.api.nvim_create_autocmd('LspAttach', { end local fzf = require 'fzf-lua' + fzf.register_ui_select() map('grn', vim.lsp.buf.rename, '[R]e[n]ame') - map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) + map('gra', fzf.lsp_code_actions, '[G]oto Code [A]ction', { 'n', 'x' }) map('grr', fzf.lsp_references, '[G]oto [R]eferences') map('gri', fzf.lsp_implementations, '[G]oto [I]mplementation') map('grd', fzf.lsp_definitions, '[G]oto [D]efinition') @@ -112,93 +108,97 @@ vim.diagnostic.config { virtual_text = false, } -local capabilities = require('blink.cmp').get_lsp_capabilities() -local servers = { - prettierd = {}, - ansiblels = {}, - clangd = {}, - gopls = {}, - ty = {}, - yamlls = {}, - rust_analyzer = {}, - ts_ls = {}, - lua_ls = { - settings = { - Lua = { - completion = { - callSnippet = 'Replace', - }, +vim.lsp.config('*', { + capabilities = require('blink.cmp').get_lsp_capabilities(), +}) + +vim.lsp.config('harper_ls', { + filetypes = { 'markdown', 'gitcommit', 'asciidoc' }, + settings = { + ['harper-ls'] = { + diagnosticSeverity = 'warning', + linters = { + SpellCheck = false, }, }, }, - stylua = {}, - mesonlsp = {}, - terraformls = {}, - bashls = {}, - jdtls = { - settings = { - java = { - configuration = { - updateBuildConfiguration = 'interactive', - refreshBundles = true, - }, - completion = { - favoriteStaticMembers = { - 'org.hamcrest.MatcherAssert.assertThat', - 'org.hamcrest.Matchers.*', - 'org.hamcrest.CoreMatchers.*', - 'org.junit.jupiter.api.Assertions.*', - 'java.util.Objects.requireNonNull', - 'java.util.Objects.requireNonNullElse', - }, - }, - contentProvider = { preferred = 'fernflower' }, - eclipse = { - downloadSources = true, - }, - implementationsCodeLens = { - enabled = true, - }, - inlayHints = { - parameterNames = { - enabled = 'all', - }, - }, - maven = { - downloadSources = true, - }, - referencesCodeLens = { - enabled = true, - }, - references = { - includeDecompiledSources = true, +}) + +vim.lsp.config('lua_ls', { + settings = { + Lua = { + codeLens = { enable = true }, + hint = { enable = true, semicolon = 'Disable' }, + completion = { + callSnippet = 'Replace', + }, + }, + }, +}) + +vim.lsp.config('jdtls', { + settings = { + java = { + configuration = { + updateBuildConfiguration = 'interactive', + refreshBundles = true, + }, + completion = { + favoriteStaticMembers = { + 'org.hamcrest.MatcherAssert.assertThat', + 'org.hamcrest.Matchers.*', + 'org.hamcrest.CoreMatchers.*', + 'org.junit.jupiter.api.Assertions.*', + 'java.util.Objects.requireNonNull', + 'java.util.Objects.requireNonNullElse', }, - saveActions = { - organizeImports = true, + }, + contentProvider = { preferred = 'fernflower' }, + eclipse = { + downloadSources = true, + }, + implementationsCodeLens = { + enabled = true, + }, + inlayHints = { + parameterNames = { + enabled = 'all', }, - signatureHelp = { enabled = true }, - sources = { - organizeImports = { - starThreshold = 9999, - staticStarThreshold = 9999, - }, + }, + maven = { + downloadSources = true, + }, + referencesCodeLens = { + enabled = true, + }, + references = { + includeDecompiledSources = true, + }, + saveActions = { + organizeImports = true, + }, + signatureHelp = { enabled = true }, + sources = { + organizeImports = { + starThreshold = 9999, + staticStarThreshold = 9999, }, }, }, }, -} +}) -local ensure_installed = vim.tbl_keys(servers or {}) -require('mason-tool-installer').setup { ensure_installed = ensure_installed } -require('mason-lspconfig').setup { - ensure_installed = {}, - automatic_installation = false, - automatic_enable = true, - handlers = { - function(server_name) - local server = servers[server_name] or {} - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, +vim.lsp.enable { + 'harper_ls', + 'lua_ls', + 'ansiblels', + 'clangd', + 'gopls', + 'ty', + 'yamlls', + 'rust_analyzer', + 'ts_ls', + 'terraformls', + 'bashls', + 'jdtls', } diff --git a/.config/nvim/lua/eugenetriguba/plugins/markdown.lua b/.config/nvim/lua/eugenetriguba/plugins/markdown.lua new file mode 100644 index 0000000..1f830ed --- /dev/null +++ b/.config/nvim/lua/eugenetriguba/plugins/markdown.lua @@ -0,0 +1,40 @@ +-- Enable folding. +vim.g.vim_markdown_folding_disabled = 0 + +-- Fold heading in with the contents. +vim.g.vim_markdown_folding_style_pythonic = 1 + +-- Don't use the shipped key bindings. +vim.g.vim_markdown_no_default_key_mappings = 1 + +-- Autoshrink TOCs. +vim.g.vim_markdown_toc_autofit = 1 + +-- Indentation for new lists. We don't insert bullets as it doesn't play +-- nicely with `gq` formatting. It relies on a hack of treating bullets +-- as comment characters. +-- See https://github.com/plasticboy/vim-markdown/issues/232 +vim.g.vim_markdown_new_list_item_indent = 0 +vim.g.vim_markdown_auto_insert_bullets = 0 + +-- Filetype names and aliases for fenced code blocks. +vim.g.vim_markdown_fenced_languages = { 'py=python', 'js=javascript', 'bash=sh', 'viml=vim' } + +-- Highlight front matter +vim.g.vim_markdown_toml_frontmatter = 1 +vim.g.vim_markdown_json_frontmatter = 1 +vim.g.vim_markdown_frontmatter = 1 + +-- Format strike-through text (wrapped in `~~`). +vim.g.vim_markdown_strikethrough = 1 + +vim.pack.add { + { + name = 'markdown-preview.nvim', + src = 'https://github.com/iamcco/markdown-preview.nvim', + }, + { + name = 'vim-markdown', + src = 'https://github.com/preservim/vim-markdown', + }, +} diff --git a/.config/nvim/lua/eugenetriguba/plugins/mason.lua b/.config/nvim/lua/eugenetriguba/plugins/mason.lua new file mode 100644 index 0000000..3b7d6e0 --- /dev/null +++ b/.config/nvim/lua/eugenetriguba/plugins/mason.lua @@ -0,0 +1,55 @@ +vim.pack.add { + { + name = 'mason.nvim', + src = 'https://github.com/williamboman/mason.nvim', + }, + { + name = 'mason-tool-installer.nvim', + src = 'https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim', + }, +} + +local lsps = { + 'harper-ls', + 'lua-language-server', + 'ansible-language-server', + 'clangd', + 'gopls', + 'ty', + 'yaml-language-server', + 'rust-analyzer', + 'typescript-language-server', + 'terraform-ls', + 'bash-language-server', + 'jdtls', +} + +local formatters = { + 'prettierd', + 'stylua', + 'black', + 'isort', + 'clang-format', + 'terraform', + 'shfmt', + 'google-java-format', + 'taplo', +} + +local linters = { + 'hadolint', + 'jsonlint', + 'tflint', + 'markdownlint', + 'vale', + 'ruff', + 'shellcheck', +} + +local tools = {} +vim.list_extend(tools, lsps) +vim.list_extend(tools, formatters) +vim.list_extend(tools, linters) + +require('mason').setup {} +require('mason-tool-installer').setup { ensure_installed = tools } diff --git a/.config/nvim/lua/eugenetriguba/plugins/nvim-dap.lua b/.config/nvim/lua/eugenetriguba/plugins/nvim-dap.lua new file mode 100644 index 0000000..00bb4f3 --- /dev/null +++ b/.config/nvim/lua/eugenetriguba/plugins/nvim-dap.lua @@ -0,0 +1,44 @@ +vim.pack.add { + { + name = 'nvim-dap', + src = 'https://github.com/mfussenegger/nvim-dap', + version = '0.10.0', + }, + { + name = 'osv', + src = 'https://github.com/jbyuki/one-small-step-for-vimkind', + version = 'main', + }, +} + +local dap = require 'dap' +dap.configurations.lua = { + { + type = 'nlua', + request = 'attach', + name = 'Attach to running Neovim instance', + }, +} + +dap.adapters.nlua = function(callback, config) + callback { type = 'server', host = config.host or '127.0.0.1', port = config.port or 8086 } +end + +vim.keymap.set('n', '<leader>db', require('dap').toggle_breakpoint, { noremap = true, desc = '[D]ebug [B]reakpoint' }) +vim.keymap.set('n', '<leader>dc', require('dap').continue, { noremap = true, desc = '[D]ebug [C]ontinue' }) +vim.keymap.set('n', '<leader>do', require('dap').step_over, { noremap = true, desc = '[D]ebug Step [O]ver' }) +vim.keymap.set('n', '<leader>di', require('dap').step_into, { noremap = true, desc = '[D]ebug Step [I]nto' }) + +vim.keymap.set('n', '<leader>dl', function() + require('osv').launch { port = 8086 } +end, { noremap = true, desc = '[D]ebug [L]ua' }) + +vim.keymap.set('n', '<leader>dw', function() + local widgets = require 'dap.ui.widgets' + widgets.hover() +end) + +vim.keymap.set('n', '<leader>df', function() + local widgets = require 'dap.ui.widgets' + widgets.centered_float(widgets.frames) +end) diff --git a/.config/nvim/lua/eugenetriguba/plugins/nvim-lint.lua b/.config/nvim/lua/eugenetriguba/plugins/nvim-lint.lua index 8c5ada0..a81e429 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/nvim-lint.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/nvim-lint.lua @@ -27,7 +27,7 @@ lint.linters_by_ft['dockerfile'] = { 'hadolint' } lint.linters_by_ft['json'] = { 'jsonlint' } lint.linters_by_ft['terraform'] = { 'tflint', 'terraform_validate' } lint.linters_by_ft['python'] = { 'ruff' } -lint.linters_by_ft['markdown'] = nil +lint.linters_by_ft['markdown'] = { 'markdownlint', 'vale' } lint.linters_by_ft['text'] = nil lint.linters_by_ft['xml'] = { 'xmllint' } lint.linters_by_ft['sh'] = { 'shellcheck' } diff --git a/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua b/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua index 322f475..360c3a5 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua @@ -1,5 +1,19 @@ -- Treesitter adds understanding of the source code text (e.g. fields, methods, -- classes) + +vim.api.nvim_create_autocmd('PackChanged', { + callback = function(event) + local name, kind = event.data.spec.name, event.data.kind + if name == 'nvim-treesitter' and (kind == 'update' or kind == 'install') then + vim.schedule(function() + -- If nvim-treesitter was updated, run ':TSUpdate' to + -- ensure the installed parsers are also updated. + vim.cmd 'TSUpdate all' + end) + end + end, +}) + vim.pack.add { { name = 'nvim-treesitter', @@ -30,16 +44,3 @@ vim.api.nvim_create_autocmd('FileType', { require('treesitter-context').setup { multiline_threshold = 10, } - -vim.api.nvim_create_autocmd('PackChanged', { - callback = function(event) - local name, kind = event.data.spec.name, event.data.kind - if name == 'nvim-treesitter' and (kind == 'update' or kind == 'install') then - vim.schedule(function() - -- If nvim-treesitter was updated, run ':TSUpdate' to - -- ensure the installed parsers are also updated. - vim.cmd 'TSUpdate all' - end) - end - end, -}) diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index af9a37d..d000a4c 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -1,7 +1,7 @@ { "plugins": { "LuaSnip": { - "rev": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c", + "rev": "642b0c595e11608b4c18219e93b88d7637af27bc", "src": "https://github.com/L3MON4D3/LuaSnip" }, "blink-cmp-copilot": { @@ -9,18 +9,18 @@ "src": "https://github.com/giuxtaposition/blink-cmp-copilot" }, "blink.cmp": { - "rev": "b19413d214068f316c78978b08264ed1c41830ec", + "rev": "451168851e8e2466bc97ee3e026c3dcb9141ce07", "src": "https://github.com/saghen/blink.cmp", - "version": "'v1.8.0'" + "version": "'v1.10.1'" }, "conform.nvim": { "rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395", "src": "https://github.com/stevearc/conform.nvim" }, "conjure": { - "rev": "90e7dbda6b2ba4e00e2876e7a50311e2e0ba51d2", + "rev": "d4c95e73c30f5622e85b45596745cfac65a965a1", "src": "https://github.com/Olical/conjure", - "version": "'v4.58.0'" + "version": "'v4.59.0'" }, "fidget.nvim": { "rev": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970", @@ -31,11 +31,11 @@ "src": "https://github.com/rafamadriz/friendly-snippets" }, "fzf-lua": { - "rev": "d9508cc1d05ffcdc91a32dfd38fc1013a56b20da", + "rev": "bde73a6886b607246095aa59f396de5e0d036890", "src": "https://github.com/ibhagwan/fzf-lua" }, "gitsigns": { - "rev": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3", + "rev": "a462f416e2ce4744531c6256252dee99a7d34a83", "src": "https://github.com/lewis6991/gitsigns.nvim" }, "harpoon": { @@ -48,7 +48,7 @@ "src": "https://github.com/lukas-reineke/indent-blankline.nvim" }, "lazydev.nvim": { - "rev": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d", + "rev": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d", "src": "https://github.com/folke/lazydev.nvim" }, "lazygit.nvim": { @@ -59,9 +59,9 @@ "rev": "47f91c416daef12db467145e16bed5bbfe00add8", "src": "https://github.com/nvim-lualine/lualine.nvim" }, - "mason-lspconfig.nvim": { - "rev": "a324581a3c83fdacdb9804b79de1cbe00ce18550", - "src": "https://github.com/williamboman/mason-lspconfig.nvim" + "markdown-preview.nvim": { + "rev": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee", + "src": "https://github.com/iamcco/markdown-preview.nvim" }, "mason-tool-installer.nvim": { "rev": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc", @@ -72,7 +72,7 @@ "src": "https://github.com/williamboman/mason.nvim" }, "mini": { - "rev": "9d359222b3643f1fccbd8f3180445842e1cae00b", + "rev": "439cdcd6992bc9012efd7d8ed7a7b7a0f1fac32a", "src": "https://github.com/nvim-mini/mini.nvim", "version": "'main'" }, @@ -84,27 +84,41 @@ "rev": "065c7713fb4cd0124fe1462f15f27feeb8b04406", "src": "https://github.com/echasnovski/mini.indentscope" }, + "nord": { + "rev": "80c1e5321505aeb22b7a9f23eb82f1e193c12470", + "src": "https://github.com/shaunsingh/nord.nvim" + }, + "nvim-dap": { + "rev": "6a5bba0ddea5d419a783e170c20988046376090d", + "src": "https://github.com/mfussenegger/nvim-dap", + "version": "'0.10.0'" + }, "nvim-lint": { - "rev": "606b823a57b027502a9ae00978ebf4f5d5158098", + "rev": "4b03656c09c1561f89b6aa0665c15d292ba9499d", "src": "https://github.com/mfussenegger/nvim-lint" }, "nvim-lspconfig": { - "rev": "0203a9608d63eda57679b01e69f33a7b4c34b0d1", + "rev": "1a6d69206749a646ef28bfb39460610b14baff40", "src": "https://github.com/neovim/nvim-lspconfig" }, "nvim-treesitter": { - "rev": "5cb05e1b0fa3c469958a2b26f36b3fe930af221c", + "rev": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849", "src": "https://github.com/nvim-treesitter/nvim-treesitter", "version": "'main'" }, "nvim-treesitter-context": { - "rev": "529ee357b8c03d76ff71233afed68fd0f5fe10b1", + "rev": "adf4b6b0420b7be6c717ef0ac7993183d6c201b1", "src": "https://github.com/nvim-treesitter/nvim-treesitter-context" }, "oil": { "rev": "0fcc83805ad11cf714a949c98c605ed717e0b83e", "src": "https://github.com/stevearc/oil.nvim" }, + "osv": { + "rev": "1af6ffb9b5229a856e8090fa2f690e0931a5aace", + "src": "https://github.com/jbyuki/one-small-step-for-vimkind", + "version": "'main'" + }, "parinfer-rust": { "rev": "845bfbb9916687cba5b6bae088c9eab70dbb83a3", "src": "https://github.com/eraserhd/parinfer-rust", @@ -119,13 +133,17 @@ "src": "https://github.com/nvim-lua/plenary.nvim" }, "tokyonight": { - "rev": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd", + "rev": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6", "src": "https://github.com/folke/tokyonight.nvim" }, "trouble.nvim": { "rev": "bd67efe408d4816e25e8491cc5ad4088e708a69a", "src": "https://github.com/folke/trouble.nvim" }, + "vim-markdown": { + "rev": "1bc9d0cd8e1cc3e901b0a49c2b50a843f1c89397", + "src": "https://github.com/preservim/vim-markdown" + }, "vim-tmux-navigator": { "rev": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432", "src": "https://github.com/christoomey/vim-tmux-navigator" diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add index 8bb626b..df3507c 100644 --- a/.config/nvim/spell/en.utf-8.add +++ b/.config/nvim/spell/en.utf-8.add @@ -5,3 +5,32 @@ liveness iteratively inlined dereferenced +tmux +neovim +Resize +ghostty +config +Ghostty's +https +ctrl +LSP +nREPL +Quicklisp +taskipy2 +taskipy +Args +pypi +npm's +pyproject +toml +unittest's +taskipy's +virtualenv +Triguba +uv +subcommand +CLI +devel +triaged +macOS +RapidFuzz diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl Binary files differindex 4dd9cf9..cd70476 100644 --- a/.config/nvim/spell/en.utf-8.add.spl +++ b/.config/nvim/spell/en.utf-8.add.spl |