update lsp-setup

.zshrc

@@ -37,6 +37,7 @@ zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 
 
 export LC_ALL=en_US.UTF-8  
+export EDITOR=vim
 export LANG=en_US.UTF-8
 export MANPAGER="sh -c \"col -b | vim -c 'set ft=man ts=8 nomod nolist nonu' \
     -c 'nnoremap i <nop>' \
@@ -155,8 +156,9 @@ function klogs() {
 
 #export LESS_TERMCAP_so=$'\E[30;43m'
 
-if [ $(uname -m) = 'arm64' ]; then
+if [ $arch = 'arm64' ]; then
     eval "$(/opt/homebrew/bin/brew shellenv)"
+    . /opt/homebrew/opt/asdf/libexec/asdf.sh
 fi
 
 #neofetch

nvim/lua/config/nvim-lsp-setup.lua

@@ -1,30 +1,12 @@
-require('nvim-lsp-setup').setup({
-    default_mappings = true,
-    -- Default mappings
-    -- gD = 'lua vim.lsp.buf.declaration()',
-    -- gd = 'lua vim.lsp.buf.definition()',
-    -- gt = 'lua vim.lsp.buf.type_definition()',
-    -- gi = 'lua vim.lsp.buf.implementation()',
-    -- gr = 'lua vim.lsp.buf.references()',
-    -- K = 'lua vim.lsp.buf.hover()',
-    -- ['<C-k>'] = 'lua vim.lsp.buf.signature_help()',
-    -- ['<space>rn'] = 'lua vim.lsp.buf.rename()',
-    -- ['<space>ca'] = 'lua vim.lsp.buf.code_action()',
-    -- ['<space>f'] = 'lua vim.lsp.buf.formatting()',
-    -- ['<space>e'] = 'lua vim.lsp.diagnostic.show_line_diagnostics()',
-    -- ['[d'] = 'lua vim.lsp.diagnostic.goto_prev()',
-    -- [']d'] = 'lua vim.lsp.diagnostic.goto_next()',
-    mappings = {
+local utils = require('nvim-lsp-setup.utils')
+local mappings = {
         -- Example mappings for telescope pickers
-        -- gd = 'lua require"telescope.builtin".lsp_definitions()',
-        -- gi = 'lua require"telescope.builtin".lsp_implementations()',
-        -- gr = 'lua require"telescope.builtin".lsp_references()',
-    },
-    -- Global on_attach
-    -- on_attach = function(client, bufnr) {
-    --     utils.format_on_save(client)
-    -- }, 
-     servers = {
+         gd = 'lua require"telescope.builtin".lsp_definitions()',
+         gi = 'lua require"telescope.builtin".lsp_implementations()',
+         gr = 'lua require"telescope.builtin".lsp_references()',
+}
+
+local servers = {
         -- Automatically install lsp server
         -- LSP server configuration please see: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
         bashls = {},
@@ -42,8 +24,19 @@ require('nvim-lsp-setup').setup({
         },
         eslint = {},
         jsonls = {},
-        clangd = {},
-        gopls = {},
+        clangd = require('nvim-lsp-setup.clangd_extensions').setup(),
+        gopls = {
+            settings = {
+                golsp = {
+                    gofumpt = true,
+                    staticcheck = true,
+                    useplaceholders = true,
+                    codelenses = {
+                        gc_details = true,
+                    },
+                },
+            },
+        },
         tsserver = {},
         prosemd_lsp = {},
 
@@ -67,9 +60,53 @@ require('nvim-lsp-setup').setup({
             lspconfig = {
                 on_attach = function(client, _)
                     -- Disable formatting
-                    require('nvim-lsp-setup.utils').disable_formatting(client)
+                    utils.disable_formatting(client)
                 end,
             },
         }),
+    }
+
+local settings = {
+    default_mappings = true,
+    -- Default mappings
+    -- gD = 'lua vim.lsp.buf.declaration()',
+    -- gd = 'lua vim.lsp.buf.definition()',
+    -- gt = 'lua vim.lsp.buf.type_definition()',
+    -- gi = 'lua vim.lsp.buf.implementation()',
+    -- gr = 'lua vim.lsp.buf.references()',
+    -- K = 'lua vim.lsp.buf.hover()',
+    -- ['<C-k>'] = 'lua vim.lsp.buf.signature_help()',
+    -- ['<space>rn'] = 'lua vim.lsp.buf.rename()',
+    -- ['<space>ca'] = 'lua vim.lsp.buf.code_action()',
+    -- ['<space>f'] = 'lua vim.lsp.buf.formatting()',
+    -- ['<space>e'] = 'lua vim.lsp.diagnostic.show_line_diagnostics()',
+    -- ['[d'] = 'lua vim.lsp.diagnostic.goto_prev()',
+    -- [']d'] = 'lua vim.lsp.diagnostic.goto_next()',
+    mappings = mappings,
+    -- Global on_attach
+    -- on_attach = function(client, bufnr) {
+    --     utils.format_on_save(client)
+    -- }, 
+     servers = servers,
+}
+
+require('nvim-lsp-setup').setup(settings)
+
+local null_ls = require('null-ls')
+null_ls.setup({
+    sources = {
+        null_ls.builtins.formatting.stylua.with({
+            extra_args = { '--config-path', vim.fn.expand('~/.config/stylua/stylua.toml') },
+        }),
     },
+    on_attach = function(client)
+        utils.format_on_save(client)
+    end,
 })
+
+require('lsp_signature').setup({})
+require('lsp-colors').setup({})
+
+local border = { '╭', '─', '╮', '│', '╯', '─', '╰', '│' }
+vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, { border = border })
+vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border })

nvim/lua/plugins.lua

@@ -14,7 +14,6 @@ end
 
 return require('packer').startup(function(use)
     use('wbthomason/packer.nvim')
-    use('folke/lua-dev.nvim')
     use('nvim-lua/plenary.nvim')
 
     use('folke/tokyonight.nvim')
@@ -179,11 +178,15 @@ return require('packer').startup(function(use)
         requires = {
             'neovim/nvim-lspconfig',
             'williamboman/nvim-lsp-installer',
+            'folke/lsp-colors.nvim',
+            'folke/lua-dev.nvim',
+            'ray-x/lsp_signature.nvim',            
+            'jose-elias-alvarez/null-ls.nvim',
+            'RRethy/vim-illuminate',
+            'simrat39/rust-tools.nvim',
+            'p00f/clangd_extensions.nvim',
         },
     })
-    use({
-        'jose-elias-alvarez/null-ls.nvim',
-    })
     --use({
     --'neovim/nvim-lspconfig',
     --})
@@ -215,7 +218,6 @@ return require('packer').startup(function(use)
     use('Vimjas/vim-python-pep8-indent')
     -- rust
     use('rust-lang/rust.vim')
-    use('simrat39/rust-tools.nvim')
     use('mfussenegger/nvim-dap')
 end)