From 08e9528be784c23cf6f4e627f3353c97c63c881f Mon Sep 17 00:00:00 2001 From: Rudis Muiznieks Date: Sun, 4 Jun 2023 13:48:33 -0500 Subject: [PATCH] some fixes, switch back to fzf --- nvim/lua/plugins-conf.lua | 16 ++++++---------- zsh/zshrc | 3 +-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/nvim/lua/plugins-conf.lua b/nvim/lua/plugins-conf.lua index 0156707..892a4ba 100644 --- a/nvim/lua/plugins-conf.lua +++ b/nvim/lua/plugins-conf.lua @@ -5,24 +5,20 @@ local lspcap = require('cmp_nvim_lsp') .default_capabilities(vim.lsp.protocol.make_client_capabilities()) local lspatt = function(client, bufnr) vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - -- disabling semantic highlighting for omnisharp https://github.com/OmniSharp/omnisharp-roslyn/issues/2483 + -- bug workaround for omnisharp https://github.com/OmniSharp/omnisharp-roslyn/issues/2483 if client.name == "omnisharp" then + local function toSnakeCase(str) + return string.gsub(str, "%s*[- ]%s*", "_") + end local tokenModifiers = client.server_capabilities.semanticTokensProvider.legend.tokenModifiers for i, v in ipairs(tokenModifiers) do - local tmp = string.gsub(v, ' ', '_') - tokenModifiers[i] = string.gsub(tmp, '-_', '') + tokenModifiers[i] = toSnakeCase(v) end local tokenTypes = client.server_capabilities.semanticTokensProvider.legend.tokenTypes for i, v in ipairs(tokenTypes) do - local tmp = string.gsub(v, ' ', '_') - tokenTypes[i] = string.gsub(tmp, '-_', '') + tokenTypes[i] = toSnakeCase(v) end - - --client.server_capabilities.semanticTokensProvider = { - -- legend = {}, - -- vim_lsp_semantic_tokens = {}, - --} end end diff --git a/zsh/zshrc b/zsh/zshrc index 3515f35..92a6da8 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -20,8 +20,7 @@ plug "sindresorhus/pure" plug "zsh-users/zsh-autosuggestions" plug "zsh-users/zsh-syntax-highlighting" plug "zap-zsh/exa" -#plug "zap-zsh/fzf" -plug "ellie/atuin" +plug "zap-zsh/fzf" plug "fdellwing/zsh-bat" plug "lukechilds/zsh-nvm"