diff --git a/cspell.json b/cspell.json index 080d1b6..ab7558d 100644 --- a/cspell.json +++ b/cspell.json @@ -1 +1 @@ -{"words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer","esac","pannable","zoomable","elkjs","Arrayible","Falsey","xyflow","leftnav","topnav","nodrag","nowheel","janky","draghandle","Sandboxed","Dismissable","dashdraw","chrono","serde","rustls","schemars","webserver","concats","deepmerge","Customizer","reqwest","brotli","peekable","PDEPO","dotenv","taskserver","walkdir","uuidgen","tolower","nzzzv","tabprevious","tabnext","vsplit","tabclose","tabnew","Neotree","noequalalways","equalalways","bufdo","winnr","keymap","mapleader","maplocalleader","keymaps","setloclist","itertools","ollama","ainvoke","Floaterm","Diffview","nocombine","gitsigns","endfor","primereact","reactiveness","toggleable","unconnectable","Prereq","autocmd"],"version":"0.2","language":"en","flagWords":[]} +{"version":"0.2","language":"en","words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer","esac","pannable","zoomable","elkjs","Arrayible","Falsey","xyflow","leftnav","topnav","nodrag","nowheel","janky","draghandle","Sandboxed","Dismissable","dashdraw","chrono","serde","rustls","schemars","webserver","concats","deepmerge","Customizer","reqwest","brotli","peekable","PDEPO","dotenv","taskserver","walkdir","uuidgen","tolower","nzzzv","tabprevious","tabnext","vsplit","tabclose","tabnew","Neotree","noequalalways","equalalways","bufdo","winnr","keymap","mapleader","maplocalleader","keymaps","setloclist","itertools","ollama","ainvoke","Floaterm","Diffview","nocombine","gitsigns","endfor","primereact","reactiveness","toggleable","unconnectable","Prereq","autocmd","lualine","codedark","filesize","searchcount","selectioncount","statusline","winbar","newfile","pyright","bufnr"],"flagWords":[]} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index c59bdf7..cf8b5a2 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -14,7 +14,7 @@ local function lsp_clients() end local function langs() - local langs = {} + local l = {} for _, client in pairs(vim.lsp.buf_get_clients(0)) do local out = nil if client.name == "pyright" then @@ -23,12 +23,12 @@ local function langs() out = "node " .. vim.fn.system({ "node", "--version" }) end if out ~= nil and out ~= "" then - langs[#langs + 1] = vim.trim(out) + l[#l + 1] = vim.trim(out) end end - table.sort(langs) - return table.concat(langs, " • "), " " + table.sort(l) + return table.concat(l, " • "), " " end return { diff --git a/lua/plugins/null-ls.lua b/lua/plugins/null-ls.lua index 64d7c2e..df50bab 100644 --- a/lua/plugins/null-ls.lua +++ b/lua/plugins/null-ls.lua @@ -85,7 +85,6 @@ return { null_ls.builtins.diagnostics.cspell.with({ extra_args = { "--config", "~/.config/nvim/cspell.json" }, diagnostics_postprocess = function(diagnostic) - -- vim.notify(vim.inspect(diagnostic)) diagnostic.message = diagnostic.user_data.misspelled diagnostic.severity = vim.diagnostic.severity.HINT end, @@ -98,6 +97,17 @@ return { config.update_in_insert = true config.debug = true + -- Don't run this on these buffer types + local ignored_filetypes = { "NvimTree", "terminal" } + config.on_attach = function(client, bufnr) + local ft = vim.api.nvim_buf_get_option(bufnr, "filetype") + if U.table_contains(ignored_filetypes, ft) then + if client.resolved_capabilities ~= nil and next(client.resolved_capabilities) ~= nil then + client.resolved_capabilities.code_action = false + end + end + end + return config end, }, diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua index c4aa0a9..70de7bb 100644 --- a/lua/plugins/nvim-tree.lua +++ b/lua/plugins/nvim-tree.lua @@ -53,13 +53,6 @@ return { }, }, }, - diagnostics = { - enable = true, - severity = { - min = vim.diagnostic.severity.ERROR, - max = vim.diagnostic.severity.ERROR, - } - }, filters = { dotfiles = false, git_ignored = false, diff --git a/lua/util.lua b/lua/util.lua index fd627b3..4034a37 100644 --- a/lua/util.lua +++ b/lua/util.lua @@ -77,6 +77,15 @@ function M.spread(template) end end +function M.table_contains(table, element) + for _, value in pairs(table) do + if value == element then + return true + end + end + return false +end + -- From https://github.com/lukas-reineke/onedark.nvim/blob/master/lua/onedark.lua function M.highlight(group, options) local guifg = options.fg or "NONE"