diff --git a/init.lua b/init.lua index 1c27a43..c0c61e3 100644 --- a/init.lua +++ b/init.lua @@ -59,7 +59,7 @@ o.tabstop = 4 -- A physical tab is 4 characters wide o.shiftwidth = 4 -- A unit of indentention is 4 levels wide o.wrapmargin = 0 -- Disable hard line wrapping o.textwidth = 0 -- Comments lines should wrap at 100 chars -o.laststatus = 3 +o.laststatus = 3 -- Use one global status bar -- Set key g.mapleader = ' ' vim.cmd 'filetype plugin indent on' @@ -147,13 +147,17 @@ do which_key.register { ['-'] = {zoom_out, "Zoom out"} } if workman then - which_key.register { j = {'n', 'Next search match'} } - which_key.register { k = {'e', 'End of word'} } - which_key.register { n = {'gj', 'Down'} } - which_key.register { e = {'gk', 'Up'} } + which_key.register { + j = {'n', 'Next search match'}, + k = {'e', 'End of word'}, + n = {'gj', 'Down'}, + e = {'gk', 'Up'}, + } else - which_key.register { j = {'gj', 'Down'} } - which_key.register { k = {'gk', 'Up'} } + which_key.register { + j = {'gj', 'Down'}, + k = {'gk', 'Up'} + } end end end @@ -272,7 +276,7 @@ require'packer'.startup(function(use) use 'rust-lang/rust.vim' -- Editing -- - use 'jiangmiao/auto-pairs' + use 'LunarWatcher/auto-pairs' use 'ojroques/nvim-bufdel' --use 'yuttie/comfortable-motion.vim' use {'jbyuki/instant.nvim', config = function () @@ -641,7 +645,7 @@ require'packer'.startup(function(use) use {'nvim-telescope/telescope-project.nvim', config = function () require'telescope'.load_extension('project') end} - use {'nvim-telescope/telescope-ui-select.nvim', config = function () + use {'nvim-telescope/telescope-ui-select.nvim', after = 'telescope.nvim', config = function () require'telescope'.load_extension('ui-select') end} use {'nvim-telescope/telescope-dap.nvim', after = 'telescope.nvim', config = function() @@ -708,6 +712,8 @@ vim.cmd [[ ---- autopairs ---- vim.g.AutoPairsMultilineClose = 0 +vim.g.AutoPairsMapBS = 1 +vim.g.AutoPairsCompatibleMaps = 1 ---- barbar ---- @@ -910,6 +916,7 @@ local function on_attach(client, bufnr) i = {'Telescope lsp_implementations', 'Implementation'}, a = {vim.lsp.buf.code_action, 'Code action'}, r = {vim.lsp.buf.rename, 'Rename'}, + h = {function() vim.lsp.inlay_hint(0, nil) end, 'Inlay hints'}, l = {vim.lsp.codelens.refresh, 'Show codelenses'}, L = {vim.lsp.codelens.run, 'Run codelens'}, t = {'Telescope lsp_type_definitions', 'Type definition'},