merge desktop into master

2 files changed, 11 insertions, 45 deletions

diff --git a/.config/nvim/lua/user/plugins/dracula.lua b/.config/nvim/lua/user/plugins/dracula.lua
index 3d1e91a..77926a0 100644
--- a/.config/nvim/lua/user/plugins/dracula.lua
+++ b/.config/nvim/lua/user/plugins/dracula.lua
@@ -3,11 +3,11 @@ vim.cmd([[
         autocmd!
         autocmd ColorScheme dracula highlight! link Pmenu DraculaBg
         autocmd ColorScheme dracula highlight link NormalFloat DraculaBgLight
-        autocmd ColorScheme dracula highlight FloatBorder guifg=#343746 guibg=#343746
+        autocmd ColorScheme dracula highlight FloatBorder guifg=none guibg=none
         autocmd ColorScheme dracula highlight DraculaBoundary guibg=none
         autocmd ColorScheme dracula highlight DraculaDiffDelete ctermbg=none guibg=none
         autocmd ColorScheme dracula highlight DraculaComment cterm=italic gui=italic
-        autocmd ColorScheme dracula highlight Normal guibg=#000000
+        autocmd ColorScheme dracula highlight Normal guibg=none
     augroup end
     colorscheme dracula
 ]])
diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua
index 1f6e642..1351959 100644
--- a/.config/nvim/lua/user/plugins/lspconfig.lua
+++ b/.config/nvim/lua/user/plugins/lspconfig.lua
@@ -48,34 +48,7 @@ local on_attach = function(_, bufnr)
 end
 
 -- provide additional completion capabilities
-local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
-
-require 'lspconfig'.eslint.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    },
-    handlers = {
-        ['window/showMessageRequest'] = function(_, result, _) return result end,
-    },
-}
-
-require 'lspconfig'.tsserver.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    }
-}
-
-require 'lspconfig'.html.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    }
-}
+local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
 require 'lspconfig'.emmet_ls.setup {
     on_attach = on_attach,
@@ -83,13 +56,13 @@ require 'lspconfig'.emmet_ls.setup {
     flags = {
         debounce_text_changes = 150,
     },
-    filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact' }
+    filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' }
 }
 
 local runtime_path = vim.split(package.path, ';')
 table.insert(runtime_path, "lua/?.lua")
 table.insert(runtime_path, "lua/?/init.lua")
-require 'lspconfig'.sumneko_lua.setup {
+require 'lspconfig'.lua_ls.setup {
     on_attach = on_attach,
     capabilities = capabilities,
     flags = {
@@ -120,22 +93,15 @@ require 'lspconfig'.sumneko_lua.setup {
     },
 }
 
-require 'lspconfig'.solargraph.setup {
+require 'lspconfig'.bashls.setup {
     on_attach = on_attach,
     capabilities = capabilities,
     flags = {
         debounce_text_changes = 150,
     },
-    cmd = { "solargraph", "stdio" },
-    filetypes = { 'ruby' },
-    settings = {
-        solargraph = {
-            diagnostics = true,
-        },
-    },
 }
 
-require 'lspconfig'.bashls.setup {
+require 'lspconfig'.pylsp.setup {
     on_attach = on_attach,
     capabilities = capabilities,
     flags = {
@@ -143,23 +109,23 @@ require 'lspconfig'.bashls.setup {
     },
 }
 
-require 'lspconfig'.pylsp.setup {
+require 'lspconfig'.clangd.setup {
     on_attach = on_attach,
     capabilities = capabilities,
     flags = {
         debounce_text_changes = 150,
     },
+    cmd = { "/usr/bin/clangd-13" };
 }
 
-require 'lspconfig'.clangd.setup {
+require 'lspconfig'.solargraph.setup {
     on_attach = on_attach,
     capabilities = capabilities,
     flags = {
         debounce_text_changes = 150,
-    },
+    }
 }
 
-
 -- suppress error messages from lang servers
 vim.notify = function(msg, log_level, _)
     if msg:match 'exit code' then