Nvim: update most of the plugins
This commit is contained in:
@@ -1,14 +1,20 @@
|
||||
vim.g.loaded = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
-- uncomment to disable netrw, but nvim scp://xx will not work:
|
||||
-- vim.g.loaded_netrwPlugin = 1
|
||||
vim.g.plug_install = 0
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.startofline = true
|
||||
|
||||
vim.g.loaded_ruby_provider = 0
|
||||
vim.g.loaded_perl_provider = 0
|
||||
|
||||
vim.opt.conceallevel = 1
|
||||
|
||||
vim.opt.shell = '/bin/bash'
|
||||
|
||||
vim.opt.number = true
|
||||
--vim.o.relativenumber = 1
|
||||
vim.opt.numberwidth = 1
|
||||
vim.opt.numberwidth = 2
|
||||
vim.opt.clipboard = "unnamedplus"
|
||||
|
||||
vim.opt.showmode = true
|
||||
@@ -68,14 +74,14 @@ vim.opt.cmdheight = 1
|
||||
vim.opt.shortmess:append('c')
|
||||
vim.opt.shortmess:remove('F')
|
||||
|
||||
vim.opt.signcolumn = "auto"
|
||||
vim.opt.signcolumn = "yes"
|
||||
|
||||
vim.opt.wildmode = { "longest", "list", "full" }
|
||||
vim.opt.completeopt = { "menu", "menuone", "noselect" }
|
||||
|
||||
vim.opt.mouse = ""
|
||||
|
||||
--match Error /\s\+$\|DU\cPA/
|
||||
vim.cmd.match([[Error /\s\+$\|DU\cPA/]])
|
||||
|
||||
vim.opt.virtualedit = "block"
|
||||
vim.opt.shiftround = true
|
||||
@@ -96,3 +102,30 @@ vim.opt.wildignore = [[
|
||||
*/tmp/*,*.so,*.swp,*.zip,**/node_modules/**,**/target/**,**.terraform/**"
|
||||
]]
|
||||
|
||||
|
||||
-- Only setup gnvim when it attaches.
|
||||
vim.api.nvim_create_autocmd({'UIEnter'}, {
|
||||
callback = function(event)
|
||||
local chanid = vim.v.event['chan']
|
||||
local chan = vim.api.nvim_get_chan_info(chanid)
|
||||
if chan.client and chan.client.name ~= 'gnvim' then
|
||||
return
|
||||
end
|
||||
|
||||
-- Gnvim brings its own runtime files.
|
||||
local gnvim = require('gnvim')
|
||||
|
||||
-- Set the font
|
||||
vim.opt.guifont = 'iM WritingMonoS Nerd Font'
|
||||
|
||||
-- Increase/decrease font.
|
||||
vim.keymap.set('n', '<c-+>', function() gnvim.font_size(1) end)
|
||||
vim.keymap.set('n', '<c-->', function() gnvim.font_size(-1) end)
|
||||
|
||||
gnvim.setup({
|
||||
cursor = {
|
||||
blink_transition = 300
|
||||
}
|
||||
})
|
||||
end
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
local map = vim.keymap.set
|
||||
local default_options = { noremap = true, silent = true }
|
||||
local expr_options = { noremap = true, expr = true, silent = true }
|
||||
--local expr_options = { noremap = true, expr = true, silent = true }
|
||||
|
||||
-- space one line, home,end globally increase/decrease
|
||||
map('n', '<Home>', 'zc', default_options)
|
||||
@@ -26,94 +26,3 @@ map('v', 'P', '"_dP', default_options)
|
||||
map('n', '<leader>2', '<cmd>set tabstop=2 softtabstop=2 shiftwidth=2<cr>', default_options)
|
||||
map('n', '<leader>4', '<cmd>set tabstop=4 softtabstop=4 shiftwidth=4<cr>', default_options)
|
||||
map('n', '<leader>8', '<cmd>set tabstop=8 softtabstop=8 shiftwidth=8<cr>', default_options)
|
||||
|
||||
-- digraphs
|
||||
map('i', '<C-k>d', '<cmd>lua require("better-digraphs").digraphs("i")<cr>', default_options)
|
||||
|
||||
-- femaco
|
||||
--map('n', '<leader>fe'. '<cmd>FeMaCo<cr>', expr_options)
|
||||
|
||||
-- fterm
|
||||
map('n', '<leader>i', '<cmd>lua require("FTerm").toggle()<CR>', default_options)
|
||||
map('t', '<leader>i', '<cmd>lua require("FTerm").toggle()<CR>', default_options)
|
||||
|
||||
-- icon picker
|
||||
-- map('n', '<C-k>i', '<cmd>IconPickerNormal<cr>', default_options)
|
||||
-- map('n', '<C-k>y', '<cmd>IconPickerYank<cr>', default_options)
|
||||
-- map('i', '<C-k>i', '<cmd>IconPickerInsert<cr>', default_options)
|
||||
|
||||
-- iswap
|
||||
map('n', '<leader>sw', '<cmd>ISwapWith<cr>', default_options)
|
||||
map('n', '<leader>ss', '<cmd>ISwap<cr>', default_options)
|
||||
|
||||
-- code window
|
||||
require('codewindow').apply_default_keybinds()
|
||||
|
||||
-- nvim tree
|
||||
map('n', '<leader>tt', '<cmd>NvimTreeToggle<cr>', default_options)
|
||||
map('n', '<leader>tf', '<cmd>NvimTreeFindFile<cr>', default_options)
|
||||
|
||||
-- other
|
||||
-- map('n', '<leader>oo', '<cmd>Other<cr>', default_options)
|
||||
-- map('n', '<leader>os', '<cmd>OtherSplit<cr>', default_options)
|
||||
-- map('n', '<leader>ov', '<cmd>OtherVSplit<cr>', default_options)
|
||||
-- map('n', '<leader>oc', '<cmd>OtherClear<cr>', default_options)
|
||||
-- Context specific bindings
|
||||
-- map('n', '<leader>ot', '<cmd>Other test<cr>', default_options)
|
||||
-- map('n', '<leader>os', '<cmd>Other scss<cr>', default_options)
|
||||
|
||||
-- quicknote
|
||||
map('n', '<leader>qn', '<cmd>lua require("quicknote").NewNoteAtCurrentLine()<cr>', default_options)
|
||||
map('n', '<leader>qs', '<cmd>lua require("quicknote").ShowNoteSigns()<cr>', default_options)
|
||||
map('n', '<leader>qe', '<cmd>lua require("quicknote").OpenNoteAtCurrentLine()<cr>', default_options)
|
||||
map('n', '<leader>qd', '<cmd>lua require("quicknote").DeleteNoteAtCurrentLine()<cr>', default_options)
|
||||
|
||||
-- telescope
|
||||
map('n', '<leader>f', '<cmd>lua require("telescope").extensions.menufacture.find_files()<cr>', default_options)
|
||||
map('n', '<leader>a', '<cmd>lua require("telescope").extensions.menufacture.grep_string()<cr>', default_options)
|
||||
map('n', '<leader>A', '<cmd>lua require("telescope").extensions.menufacture.live_grep()<cr>', default_options)
|
||||
map('n', '<leader>b', '<cmd>lua require("telescope.builtin").buffers()<cr>', default_options)
|
||||
map('n', '<leader>r', '<cmd>lua require("telescope.builtin").resume()<cr>', default_options)
|
||||
-- map('n', '<leader>fh', '<cmd>lua require('telescope.builtin').help_tags()<cr>, default_options)
|
||||
map('n', '<leader>tc', '<cmd>lua require("telescope.builtin").commands()<cr>', default_options)
|
||||
map('n', '<leader>t:', '<cmd>lua require("telescope.builtin").command_history()<cr>', default_options)
|
||||
map('n', '<leader>t/', '<cmd>lua require("telescope.builtin").search_history()<cr>', default_options)
|
||||
map('n', '<leader>tr', '<cmd>lua require("telescope.builtin").registers()<cr>', default_options)
|
||||
-- Neovim lsp pickers
|
||||
map('n', '<leader>tr', '<cmd>lua require("telescope.builtin").lsp_references()<cr>', default_options)
|
||||
map('n', '<leader>td', '<cmd>lua require("telescope.builtin").lsp_definitions()<cr>', default_options)
|
||||
-- git pickers
|
||||
map('n', '<leader>gc', '<cmd>lua require("telescope.builtin").git_commits()<cr>', default_options)
|
||||
map('n', '<leader>gC', '<cmd>lua require("telescope.builtin").git_bcommits()<cr>', default_options)
|
||||
map('n', '<leader>gb', '<cmd>lua require("telescope.builtin").git_branches()<cr>', default_options)
|
||||
-- map('n', '<leader>s', '<cmd>lua require('telescope').extensions.ultisnips.ultisnips()<cr>, default_options)
|
||||
map('n', '<leader>u', '<cmd>lua require("telescope").extensions.undo.undo()<cr>', default_options)
|
||||
|
||||
-- toggler not active
|
||||
--vim.keymap.set({'n', 'v'}, 'gt', require('nvim-toggler').toggle)
|
||||
|
||||
-- windows
|
||||
map('n', '<C-w>z', "<cmd>WindowsMaximize<cr>", default_options)
|
||||
map('n', '<C-w>_', "<cmd>WindowsMaximizeVertically<cr>", default_options)
|
||||
map('n', '<C-w>|', "<cmd>WindowsMaximizeHorizontally<cr>", default_options)
|
||||
map('n', '<C-w>=', "<cmd>WindowsEqualize<cr>", default_options)
|
||||
|
||||
-- specs
|
||||
map('n', 'n', 'n:lua require("specs").show_specs()<CR>', default_options)
|
||||
map('n', 'N', 'N:lua require("specs").show_specs()<CR>', default_options)
|
||||
map('n', '<leader><space>', function()
|
||||
vim.cmd.noh()
|
||||
require("specs").show_specs({width = 97, winhl = "Search", delay_ms = 610, inc_ms = 21})
|
||||
end, default_options)
|
||||
|
||||
vim.api.nvim_set_keymap('n', '<leader>cb', ':lua require("nvim-navbuddy").open()<cr>', default_options)
|
||||
|
||||
-- dap
|
||||
map('v', 'K', '<cmd>lua require("dapui").eval()<cr>', default_options)
|
||||
map('n', '<leader>dc', ':lua require("dap").continue()<cr>', default_options);
|
||||
map('n', '<leader>db', ':lua require("dap").toggle_breakpoint()<cr>', default_options);
|
||||
map('n', '<leader>dB', ':lua require("dap").set_breakpoint(vim.fn.input("Breakpoint condition: "))<cr>', default_options);
|
||||
map('n', '<leader>dn', ':lua require("dap").step_over()<cr>', default_options);
|
||||
map('n', '<leader>di', ':lua require("dap").step_into()<cr>', default_options);
|
||||
map('n', '<leader>do', ':lua require("dap").step_out()<cr>', default_options);
|
||||
map('n', '<leader>dl', ':lua require("dap").run_last()<cr>', default_options);
|
||||
|
||||
@@ -9,10 +9,14 @@ if not vim.loop.fs_stat(lazypath) then
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
--vim.opt.rtp:append(lazypath)
|
||||
|
||||
vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ' '
|
||||
|
||||
vim.opt.rtp:append(lazypath)
|
||||
require'lazy'.setup('plugins')
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
require'lazy'.setup('plugins', {
|
||||
change_detection = {
|
||||
enabled = true,
|
||||
notify = false
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user