diff options
| author | Grace Yoder <grace_yoder@outlook.com> | 2026-02-19 15:18:45 -0500 |
|---|---|---|
| committer | Grace Yoder <grace_yoder@outlook.com> | 2026-02-19 15:18:45 -0500 |
| commit | be13e9d29084181330c1a8446cc14b2a32ccedff (patch) | |
| tree | 20c126375bac9684549b2f1232e636ebbf87c68f /vim/.config | |
| parent | 3e110044f293aadcd22dbeace4e433c3ed181a18 (diff) | |
| parent | 20ccee259aa4063169186d054d2350245acb3fd4 (diff) | |
fixed merge
Diffstat (limited to 'vim/.config')
| -rw-r--r-- | vim/.config/nvim/init.lua | 9 | ||||
| -rw-r--r-- | vim/.config/nvim/lsp/asm-lsp.lua | 15 | ||||
| -rw-r--r-- | vim/.config/nvim/lua/native-lsp.lua | 2 | ||||
| -rw-r--r-- | vim/.config/nvim/lua/standard-lint.lua | 2 |
4 files changed, 23 insertions, 5 deletions
diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua index f79088f..9b96fd3 100644 --- a/vim/.config/nvim/init.lua +++ b/vim/.config/nvim/init.lua @@ -26,7 +26,7 @@ require("remap") if vim.g.is_purdue then - require("westwood-lint") + -- require("westwood-lint") end require("standard-lint") @@ -157,6 +157,7 @@ require("godot") - --- Enable experimental UI in neovim-nightly -require('vim._extui').enable({}) +if not vim.g.is_purdue then + -- Enable experimental UI in neovim-nightly + require('vim._extui').enable({}) +end diff --git a/vim/.config/nvim/lsp/asm-lsp.lua b/vim/.config/nvim/lsp/asm-lsp.lua new file mode 100644 index 0000000..28678c0 --- /dev/null +++ b/vim/.config/nvim/lsp/asm-lsp.lua @@ -0,0 +1,15 @@ +---@brief +--- +--- https://github.com/bergercookie/asm-lsp +--- +--- Language Server for NASM/GAS/GO Assembly +--- +--- `asm-lsp` can be installed via cargo: +--- cargo install asm-lsp + +---@type vim.lsp.Config +return { + cmd = { 'asm-lsp' }, + filetypes = { 'asm', 'vmasm' }, + root_markers = { '.asm-lsp.toml', '.git' }, +} diff --git a/vim/.config/nvim/lua/native-lsp.lua b/vim/.config/nvim/lua/native-lsp.lua index 162533d..ea0434d 100644 --- a/vim/.config/nvim/lua/native-lsp.lua +++ b/vim/.config/nvim/lua/native-lsp.lua @@ -77,6 +77,8 @@ vim.lsp.config('csharp-ls', { vim.lsp.enable("csharp-ls") +vim.lsp.enable("asm-lsp") + -- https://lsp-zero.netlify.app/blog/lsp-client-features.html vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert' } diff --git a/vim/.config/nvim/lua/standard-lint.lua b/vim/.config/nvim/lua/standard-lint.lua index 4aa79b1..2f06ce5 100644 --- a/vim/.config/nvim/lua/standard-lint.lua +++ b/vim/.config/nvim/lua/standard-lint.lua @@ -2,7 +2,7 @@ vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave", "TextCh callback = function() -- try_lint without arguments runs the linters defined in `linters_by_ft` -- for the current filetype - require("lint").try_lint() + require("lint").try_lint(nil, { ignore_errors = true }) -- You can call `try_lint` with a linter name or a list of names to always -- run specific linters, independent of the `linters_by_ft` configuration |