diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua index 4467277..2e69b5e 100644 --- a/.config/nvim/lua/blake/lsp.lua +++ b/.config/nvim/lua/blake/lsp.lua @@ -209,8 +209,10 @@ M.lspconfig = function() -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches local lsp_servers = { - clangd = 'clangd', - html = 'vscode-html-language-server', + clangd = 'clangd', + html = 'vscode-html-language-server', + sumneko_lua = 'lua-language-server', + bashls = 'bash-language-server', } for lsp, exe in pairs(lsp_servers) do if (vim.fn.executable(exe) == 1) then diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index e8be994..8abfd0d 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -16,7 +16,7 @@ return require('packer').startup(function() } -- Colors - use { -- syntax highlighting + use { -- treesitter: syntax highlighting and more 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate', config = function() require("blake.lsp").treesitter() @@ -46,18 +46,6 @@ return require('packer').startup(function() -- end, 0) -- end, } - use { -- DAP: Debug Adapter Protocol - "mfussenegger/nvim-dap", - config = function() - require("blake.lsp").dap() - end - } - use { -- DAP adapter installer - "Pocco81/DAPInstall.nvim", - config = function() - require("blake.lsp").dapinstall() - end - } use { -- Default LSP configs "neovim/nvim-lspconfig", after = "nvim-lspinstall", @@ -142,6 +130,32 @@ return require('packer').startup(function() ft = { 'md', 'markdown', } } + ---- DAP (Debug Adapter Protocol) + use { -- nvim-dap: DAP support + "mfussenegger/nvim-dap", + config = function() + require("blake.lsp").dap() + end + } + use { -- DAP adapter installer + "Pocco81/DAPInstall.nvim", + config = function() + require("blake.lsp").dapinstall() + end + } + use { -- Print Variable names while debugging + 'theHamsta/nvim-dap-virtual-text', + config = function() + require'nvim-dap-virtual-text' + -- virtual text deactivated (default) + vim.g.dap_virtual_text = true + -- show virtual text for current frame (recommended) + vim.g.dap_virtual_text = true + -- request variable values for all frames (experimental) + vim.g.dap_virtual_text = 'all frames' + end + } + -- Conveniences use { -- Undo tree 'mbbill/undotree',