fixed merge

fish/.config/fish/config.fish

@@ -50,9 +50,7 @@ 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
-end
 
 alias setupidf "source /opt/esp/esp-idf/export.fish"

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")
 
 
 
-
+if not vim.g.is_purdue then
   -- Enable experimental UI in neovim-nightly
   require('vim._extui').enable({})
+end

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' },
+}

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' }

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