diff --git a/common/.config/nvim/lua/keymappings.lua b/common/.config/nvim/lua/keymappings.lua index f39d761..d5ccd05 100644 --- a/common/.config/nvim/lua/keymappings.lua +++ b/common/.config/nvim/lua/keymappings.lua @@ -10,34 +10,21 @@ vim.api.nvim_set_keymap('', '', '"+d', opts) -- paste in insert mode vim.api.nvim_set_keymap('i', '', '"+pa', opts) --- better tree +-- vscode style quick peek at the tree vim.api.nvim_set_keymap('n', '', ":Lexplore :vertical resize 30", { noremap = true }) --- make the cursor stay on the same character when leaving insert mode -vim.api.nvim_set_keymap('i', 'ć', 'l', opts) -vim.api.nvim_set_keymap('i', 'Ć', 'l', opts) - -- make ctrl-shift arrows line movement vim.api.nvim_set_keymap('n', '', 'ddkP', opts) vim.api.nvim_set_keymap('v', '', ':m \'<-2gv=gv', opts) vim.api.nvim_set_keymap('n', '', 'ddp', opts) vim.api.nvim_set_keymap('v', '', ':m \'>+1gv=gv', opts) --- fast scrolling ---vim.api.nvim_set_keymap('n', '', '9j', opts) ---vim.api.nvim_set_keymap('n', '', '9k', opts) ---vim.api.nvim_set_keymap('v', '', '9j', opts) ---vim.api.nvim_set_keymap('v', '', '9k', opts) - -- stay in normal mode after inserting a new line vim.api.nvim_set_keymap('', 'o', 'o ', opts) vim.api.nvim_set_keymap('', 'O', 'O ', opts) -- mapping that opens .vimrc in a new tab for quick editing vim.api.nvim_set_keymap('n', 'ev', 'tabe $MYVIMRC', opts) --- mapping that sources the vimrc in the current filea doesn't work, should change all require calls to dofile --- or clear all require cache and reimport --- vim.api.nvim_set_keymap('n', 'sv', 'lua dofile(vim.fn.stdpath(\'config\')..\'/init.lua\')', { noremap = true, silent = false }) -- Mapping U to Redo. vim.api.nvim_set_keymap('', 'U', '', opts) @@ -57,27 +44,18 @@ vim.api.nvim_set_keymap('', '', '', opts) vim.api.nvim_set_keymap('', '', '', opts) vim.api.nvim_set_keymap('', '', '', opts) --- opening terminal with shortcut -vim.api.nvim_set_keymap('', '', 'silent !$TERM &', opts) - -- jumping back and forth vim.api.nvim_set_keymap('', '', '', opts) vim.api.nvim_set_keymap('', '', '', opts) -- LSP -vim.api.nvim_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) -vim.api.nvim_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) -vim.api.nvim_set_keymap('n', 'gt', 'lua vim.lsp.buf.type_definition()', opts) -vim.api.nvim_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) -vim.api.nvim_set_keymap('n', 'gf', 'lua vim.lsp.buf.references()', opts) --- usages replaced by LspSaga plugin --- vim.api.nvim_set_keymap('n', 'ga', 'lua vim.lsp.buf.code_action()', opts) -- eg. autoimport --- vim.api.nvim_set_keymap('n', 'gn', 'lua vim.lsp.diagnostic.goto_next()', opts) --- vim.api.nvim_set_keymap('n', 'gN', 'lua vim.lsp.diagnostic.goto_prev()', opts) --- vim.api.nvim_set_keymap('n', 'h', 'lua vim.lsp.buf.hover()', opts) --- vim.api.nvim_set_keymap('n', 'gr', 'lua vim.lsp.buf.rename()', opts) +vim.api.nvim_set_keymap('n', 'gD', 'lua vim.lsp.buf.definition()', opts) +vim.api.nvim_set_keymap('n', 'gT', 'lua vim.lsp.buf.type_definition()', opts) +vim.api.nvim_set_keymap('n', 'gI', 'lua vim.lsp.buf.implementation()', opts) +vim.api.nvim_set_keymap('n', 'gR', 'lua vim.lsp.buf.references()', opts) +-- Glance LSP +vim.api.nvim_set_keymap('n', 'gd', 'Glance definitions', opts) +vim.api.nvim_set_keymap('n', 'gt', 'Glance type_definitions', opts) +vim.api.nvim_set_keymap('n', 'gm', 'Glance implementations', opts) +vim.api.nvim_set_keymap('n', 'gr', 'Glance references', opts) --- autocomplete --- if autocomplete popup menu opens pressing enter will complete the first match ---vim.api.nvim_set_keymap('i', '', 'v:lua.smart_tab()', {expr = true, noremap = true}) -vim.api.nvim_set_keymap('i', '', 'pumvisible() ? "a" : ""', {expr = true, noremap = true, silent = true}) diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua index 9bed8c9..0e71035 100644 --- a/common/.config/nvim/lua/plugins.lua +++ b/common/.config/nvim/lua/plugins.lua @@ -91,7 +91,14 @@ local packer = require('packer').startup(function(use) require('plugin-config/lsp-trouble') end } - + + -- vscode like LSP code previews + use({ + 'dnlhc/glance.nvim', + config = function() + require('glance').setup({}) + end + }) -- VISUAL CHANGES diff --git a/common/.config/nvim/plugin/packer_compiled.lua b/common/.config/nvim/plugin/packer_compiled.lua index 0be8652..33805b8 100644 --- a/common/.config/nvim/plugin/packer_compiled.lua +++ b/common/.config/nvim/plugin/packer_compiled.lua @@ -117,6 +117,12 @@ _G.packer_plugins = { path = "/home/benk/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", url = "https://github.com/lewis6991/gitsigns.nvim" }, + ["glance.nvim"] = { + config = { "\27LJ\2\n8\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\vglance\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/glance.nvim", + url = "https://github.com/dnlhc/glance.nvim" + }, ["indent-blankline.nvim"] = { config = { "\27LJ\2\n–\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\21filetype_exclude\1\a\0\0\thelp\nalpha\14dashboard\rneo-tree\fTrouble\tlazy\1\0\1\tchar\b│\nsetup\21indent_blankline\frequire\0" }, loaded = true, @@ -262,30 +268,10 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: mini.starter -time([[Config for mini.starter]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/ministarter\frequire\0", "config", "mini.starter") -time([[Config for mini.starter]], false) --- Config for: codewindow.nvim -time([[Config for codewindow.nvim]], true) -try_loadstring("\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0", "config", "codewindow.nvim") -time([[Config for codewindow.nvim]], false) --- Config for: dressing.nvim -time([[Config for dressing.nvim]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/dressing\frequire\0", "config", "dressing.nvim") -time([[Config for dressing.nvim]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n=\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\"plugin-config/nvim-treesitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Config for: leap.nvim -time([[Config for leap.nvim]], true) -try_loadstring("\27LJ\2\nA\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\25add_default_mappings\tleap\frequire\0", "config", "leap.nvim") -time([[Config for leap.nvim]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/nvim-cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) +-- Config for: glance.nvim +time([[Config for glance.nvim]], true) +try_loadstring("\27LJ\2\n8\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\vglance\frequire\0", "config", "glance.nvim") +time([[Config for glance.nvim]], false) -- Config for: gitsigns.nvim time([[Config for gitsigns.nvim]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/gitsigns\frequire\0", "config", "gitsigns.nvim") @@ -294,34 +280,58 @@ time([[Config for gitsigns.nvim]], false) time([[Config for telescope.nvim]], true) try_loadstring("\27LJ\2\nc\0\0\3\0\4\0\n6\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\0029\0\3\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\28plugin-config/telescope\frequire\0", "config", "telescope.nvim") time([[Config for telescope.nvim]], false) --- Config for: trouble.nvim -time([[Config for trouble.nvim]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/lsp-trouble\frequire\0", "config", "trouble.nvim") -time([[Config for trouble.nvim]], false) -- Config for: nvim-hardline time([[Config for nvim-hardline]], true) try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rhardline\frequire\0", "config", "nvim-hardline") time([[Config for nvim-hardline]], false) --- Config for: mini.indentscope -time([[Config for mini.indentscope]], true) -try_loadstring("\27LJ\2\nr\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\foptions\1\0\1\18try_as_border\2\1\0\1\vsymbol\b│\nsetup\21mini.indentscope\frequire\0", "config", "mini.indentscope") -time([[Config for mini.indentscope]], false) +-- Config for: codewindow.nvim +time([[Config for codewindow.nvim]], true) +try_loadstring("\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0", "config", "codewindow.nvim") +time([[Config for codewindow.nvim]], false) -- Config for: noice.nvim time([[Config for noice.nvim]], true) try_loadstring("\27LJ\2\n3\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\24plugin-config/noice\frequire\0", "config", "noice.nvim") time([[Config for noice.nvim]], false) --- Config for: smart-splits.nvim -time([[Config for smart-splits.nvim]], true) -try_loadstring("\27LJ\2\n:\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\31plugin-config/smart-splits\frequire\0", "config", "smart-splits.nvim") -time([[Config for smart-splits.nvim]], false) -- Config for: indent-blankline.nvim time([[Config for indent-blankline.nvim]], true) try_loadstring("\27LJ\2\n–\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\21filetype_exclude\1\a\0\0\thelp\nalpha\14dashboard\rneo-tree\fTrouble\tlazy\1\0\1\tchar\b│\nsetup\21indent_blankline\frequire\0", "config", "indent-blankline.nvim") time([[Config for indent-blankline.nvim]], false) +-- Config for: trouble.nvim +time([[Config for trouble.nvim]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/lsp-trouble\frequire\0", "config", "trouble.nvim") +time([[Config for trouble.nvim]], false) +-- Config for: dressing.nvim +time([[Config for dressing.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/dressing\frequire\0", "config", "dressing.nvim") +time([[Config for dressing.nvim]], false) +-- Config for: mini.indentscope +time([[Config for mini.indentscope]], true) +try_loadstring("\27LJ\2\nr\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\foptions\1\0\1\18try_as_border\2\1\0\1\vsymbol\b│\nsetup\21mini.indentscope\frequire\0", "config", "mini.indentscope") +time([[Config for mini.indentscope]], false) -- Config for: lsp_signature.nvim time([[Config for lsp_signature.nvim]], true) try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18lsp_signature\frequire\0", "config", "lsp_signature.nvim") time([[Config for lsp_signature.nvim]], false) +-- Config for: leap.nvim +time([[Config for leap.nvim]], true) +try_loadstring("\27LJ\2\nA\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\25add_default_mappings\tleap\frequire\0", "config", "leap.nvim") +time([[Config for leap.nvim]], false) +-- Config for: smart-splits.nvim +time([[Config for smart-splits.nvim]], true) +try_loadstring("\27LJ\2\n:\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\31plugin-config/smart-splits\frequire\0", "config", "smart-splits.nvim") +time([[Config for smart-splits.nvim]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\"plugin-config/nvim-treesitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) +-- Config for: mini.starter +time([[Config for mini.starter]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/ministarter\frequire\0", "config", "mini.starter") +time([[Config for mini.starter]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/nvim-cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then