diff options
| -rw-r--r-- | fish/.config/fish/conf.d/fish_frozen_key_bindings.fish | 14 | ||||
| -rw-r--r-- | fish/.config/fish/config.fish | 5 | ||||
| -rw-r--r-- | vim/.config/nvim/init.lua | 2 | ||||
| -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 |
6 files changed, 35 insertions, 5 deletions
diff --git a/fish/.config/fish/conf.d/fish_frozen_key_bindings.fish b/fish/.config/fish/conf.d/fish_frozen_key_bindings.fish new file mode 100644 index 0000000..495aee9 --- /dev/null +++ b/fish/.config/fish/conf.d/fish_frozen_key_bindings.fish @@ -0,0 +1,14 @@ +# This file was created by fish when upgrading to version 4.3, to migrate +# the 'fish_key_bindings' variable from its old default scope (universal) +# to its new default scope (global). We recommend you delete this file +# and configure key bindings in ~/.config/fish/config.fish if needed. + +# set --global fish_key_bindings fish_default_key_bindings + +# Prior to version 4.3, fish shipped an event handler that runs +# `set --universal fish_key_bindings fish_default_key_bindings` +# whenever the fish_key_bindings variable is erased. +# This means that as long as any fish < 4.3 is still running on this system, +# we cannot complete the migration. +# As a workaround, erase the universal variable at every shell startup. +set --erase --universal fish_key_bindings diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index bc22228..b3b6fc6 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -49,7 +49,6 @@ if status is-interactive fish_config theme choose "Rosé Pine" starship init fish | source - if not string match -q "*purdue*" "$host" - zoxide init fish | source - end + zoxide init fish | source end + diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua index c6274d3..cf494e1 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") 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 |