diff --git a/lua/mappings.lua b/lua/mappings.lua index 2e1dd55..e4c3a10 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -28,6 +28,12 @@ vim.api.nvim_set_keymap('', 'gs', ':Gitsigns toggle_signs', -- lsp stuff vim.api.nvim_buf_set_keymap(0, 'n', 'K', 'lua vim.lsp.buf.hover()', {noremap = true}) +vim.api.nvim_set_keymap('', 'K', + 'lua vim.diagnostic.open_float()', + {noremap = true}) +vim.api.nvim_set_keymap('', 'qf', + 'lua vim.diagnostic.setqflist({open = false})Telescope quickfix', + {silent = true}) -- toggle tagbar vim.api.nvim_set_keymap('', 'tt', ':TagbarToggle', {silent = true}) -- toggle NvimTree @@ -42,14 +48,6 @@ vim.api.nvim_set_keymap('', 'w', ':HopWordAC', {silent = true}) vim.api.nvim_set_keymap('', 'l', ':HopWordCurrentLine', {silent = true}) -- telescope stuff -vim.api.nvim_set_keymap('', 'tf', ':Telescope fd', {silent = true}) +vim.api.nvim_set_keymap('', 'fd', ':Telescope fd', {silent = true}) vim.api.nvim_set_keymap('', 'tb', ':Telescope buffers', {silent = true}) -vim.api.nvim_set_keymap('', 'tq', ':Telescope quickfix', - {silent = true}) -vim.api.nvim_set_keymap('', 'tdd', - ':Telescope lsp_document_diagnostics', - {silent = true}) -vim.api.nvim_set_keymap('', 'tdw', - ':Telescope lsp_workspace_diagnostics', - {silent = true}) diff --git a/lua/pluginList.lua b/lua/pluginList.lua index 5466432..c09d96b 100644 --- a/lua/pluginList.lua +++ b/lua/pluginList.lua @@ -25,6 +25,7 @@ return require('packer').startup(function(use) after = 'packer.nvim', config = function() vim.g.serenade_enable_italic = 1 + vim.g.serenade_sign_column_background = 'none' vim.g.serenade_better_performance = 1 vim.cmd("colorscheme serenade") end @@ -113,6 +114,7 @@ return require('packer').startup(function(use) use { 'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}}, + config = function() require "plugins.telescope" end, cmd = 'Telescope' } use {'preservim/tagbar', cmd = 'TagbarToggle'} diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index 017d599..fbd4fe5 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -17,12 +17,14 @@ require('gitsigns').setup { ["n hp"] = 'lua require"gitsigns".preview_hunk()', ["n hb"] = 'lua require"gitsigns".blame_line()' }, - numhl = false, - sign_priority = 5, + -- signs + status_formatter = nil, -- Use default + numhl = false, + sign_priority = 10, signs = { - add = {hl = "DiffAdd", text = "│", numhl = "GitSignsAddNr"}, - change = {hl = "DiffChange", text = "│", numhl = "GitSignsChangeNr"}, + add = {hl = "DiffAdd", text = "+", numhl = "GitSignsAddNr"}, + change = {hl = "DiffChange", text = ">", numhl = "GitSignsChangeNr"}, changedelete = { hl = "DiffChange", text = "~", @@ -35,7 +37,15 @@ require('gitsigns').setup { numhl = "GitSignsDeleteNr" } }, + yadm = {enable = true}, - status_formatter = nil, -- Use default - watch_gitdir = {interval = 100} + -- Current line blame + current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 250, + ignore_whitespace = false + }, + current_line_blame_formatter = ', - ' } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..987a35e --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,27 @@ +require('telescope').setup { + defaults = { + -- Default configuration for telescope goes here: + -- config_key = value, + -- .. + layout_strategy = 'vertical', + layout_config = {height = 0.95} + + }, + pickers = { + -- Default configuration for builtin pickers goes here: + -- picker_name = { + -- picker_config_key = value, + -- ... + -- } + -- Now the picker_config_key will be applied every time you call this + -- builtin picker + }, + extensions = { + -- Your extension configuration goes here: + -- extension_name = { + -- extension_config_key = value, + -- } + -- please take a look at the readme of the extension you want to configure + } +} +