diff --git a/init.vim b/init.vim index 00cd1db..9203b5e 100644 --- a/init.vim +++ b/init.vim @@ -4,7 +4,6 @@ lua require("initializer") " highlight all .conf files as apache config (:]) autocmd BufEnter *.conf :setlocal filetype=apache "au BufNewFile,BufRead *.sls set filetype=sls.yaml -let mapleader = "\\" "nerdtree bindings nnoremap n :NvimTreeFocus nnoremap :NvimTreeToggle diff --git a/lua/conf-trouble.lua b/lua/conf-trouble.lua new file mode 100644 index 0000000..0325d7f --- /dev/null +++ b/lua/conf-trouble.lua @@ -0,0 +1,47 @@ +require("trouble").setup({ + position = "bottom", -- position of the list can be: bottom, top, left, right + height = 10, -- height of the trouble list when position is top or bottom + width = 50, -- width of the list when position is left or right + icons = true, -- use devicons for filenames + mode = "workspace_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist" + fold_open = "", -- icon used for open folds + fold_closed = "", -- icon used for closed folds + group = true, -- group results by file + padding = true, -- add an extra new line on top of the list + action_keys = { -- key mappings for actions in the trouble list + -- map to {} to remove a mapping, for example: + -- close = {}, + close = "q", -- close the list + cancel = "", -- cancel the preview and get back to your last window / buffer / cursor + refresh = "r", -- manually refresh + jump = {"", ""}, -- jump to the diagnostic or open / close folds + open_split = { "" }, -- open buffer in new split + open_vsplit = { "" }, -- open buffer in new vsplit + open_tab = { "" }, -- open buffer in new tab + jump_close = {"o"}, -- jump to the diagnostic and close the list + toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode + toggle_preview = "P", -- toggle auto_preview + hover = "K", -- opens a small popup with the full multiline message + preview = "p", -- preview the diagnostic location + close_folds = {"zM", "zm"}, -- close all folds + open_folds = {"zR", "zr"}, -- open all folds + toggle_fold = {"zA", "za"}, -- toggle fold of current file + previous = "k", -- previous item + next = "j" -- next item + }, + indent_lines = true, -- add an indent guide below the fold icons + auto_open = false, -- automatically open the list when you have diagnostics + auto_close = false, -- automatically close the list when you have no diagnostics + auto_preview = true, -- automatically preview the location of the diagnostic. to close preview and go back to last window + auto_fold = false, -- automatically fold a file trouble list at creation + auto_jump = {"lsp_definitions"}, -- for the given modes, automatically jump if there is only a single result + signs = { + -- icons / text used for a diagnostic + error = "", + warning = "", + hint = "", + information = "", + other = "﫠" + }, + use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client +}) diff --git a/lua/initializer.lua b/lua/initializer.lua index e7a883c..d906f92 100644 --- a/lua/initializer.lua +++ b/lua/initializer.lua @@ -11,9 +11,11 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -- load all modules +vim.g.mapleader = "\\" require("lazy-setup") require("general") require("my-lint") +require("conf-trouble") require("conf-hlslens") require("conf-gitsigns") require("conf-lualine") diff --git a/lua/lazy-setup.lua b/lua/lazy-setup.lua index 0c436d4..954e5bc 100644 --- a/lua/lazy-setup.lua +++ b/lua/lazy-setup.lua @@ -1,5 +1,3 @@ -vim.g.mapleader = " " -- make sure to set `mapleader` before lazy so your mappings are correct - require("lazy").setup({ -- NERDTree stuff { 'nvim-tree/nvim-web-devicons' }, -- optional, for file icons @@ -16,6 +14,15 @@ require("lazy").setup({ { 'williamboman/mason-lspconfig.nvim' }, { 'mfussenegger/nvim-lint' }, { 'onsails/lspkind.nvim' }, + { 'folke/trouble.nvim', + keys = { + { "xx", "TroubleToggle" }, + { "xw", "TroubleToggle workspace_diagnostics" }, + { "xd", "TroubleToggle document_diagnostics" }, + { "xl", "TroubleToggle loclist" }, + { "xq", "TroubleToggle quickfix" }, + { "gR", "TroubleToggle lsp_references" } +}}, -- various plugins { 'lewis6991/gitsigns.nvim' }, @@ -35,7 +42,7 @@ require("lazy").setup({ { 'lukas-reineke/indent-blankline.nvim' }, { 'nvim-lualine/lualine.nvim' }, - { 'itchyny/vim-cursorword' }, + { 'RRethy/vim-illuminate' }, { 'sheerun/vim-polyglot' }, { 'ray-x/lsp_signature.nvim' },