Big changes, don't remember all of them
One thing is more DAP configuration
This commit is contained in:
parent
67c70c5bb8
commit
10cdfef608
5 changed files with 54 additions and 45 deletions
|
|
@ -21,12 +21,11 @@ require('plugins')
|
|||
-- [ ] telescope
|
||||
-- [ ] zen-mode.nvim (goyo)
|
||||
-- [ ] status line
|
||||
-- [ ] chadtree keymap
|
||||
-- [ ] lspsaga
|
||||
-- [X] lspsaga
|
||||
-- [ ] lightspeed.nvim or hop.nvim
|
||||
-- [ ] lightbulb
|
||||
-- [ ] glow.nvim (markdown preview)
|
||||
-- [ ] auto-session
|
||||
-- [X] glow.nvim (markdown preview)
|
||||
-- [X] auto-session
|
||||
-- [ ] shade.nvim
|
||||
-- [ ] presence.nvim (discord presence)
|
||||
-- [ ] trouble.nvim
|
||||
|
|
|
|||
|
|
@ -195,24 +195,23 @@ M.lspconfig = function()
|
|||
local opts = { noremap=true, silent=true }
|
||||
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
|
||||
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
|
||||
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||
buf_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||
end
|
||||
|
||||
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||
|
|
@ -232,14 +231,14 @@ end -- <<<
|
|||
M.dap = function()
|
||||
-- default keybinds
|
||||
vim.cmd [[
|
||||
nnoremap <silent> <leader>b<space> <cmd>lua require'dap'.continue()<CR>
|
||||
nnoremap <silent> <leader>bo <cmd>lua require'dap'.step_over()<CR>
|
||||
nnoremap <silent> <leader>bi <cmd>lua require'dap'.step_into()<CR>
|
||||
nnoremap <silent> <leader>bO <cmd>lua require'dap'.step_out()<CR>
|
||||
nnoremap <silent> <leader>bb <cmd>lua require'dap'.toggle_breakpoint()<CR>
|
||||
nnoremap <silent> <leader>bB <cmd>lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition<cmd> '))<CR>
|
||||
nnoremap <silent> <leader>blp <cmd>lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message<cmd> '))<CR>
|
||||
nnoremap <silent> <leader>dl <cmd>lua require'dap'.run_last()<CR>
|
||||
nnoremap <silent> <leader>d<space> <cmd>lua require'dap'.continue()<CR>
|
||||
nnoremap <silent> <leader>dj <cmd>lua require'dap'.step_over()<CR>
|
||||
nnoremap <silent> <leader>dl <cmd>lua require'dap'.step_into()<CR>
|
||||
nnoremap <silent> <leader>dk <cmd>lua require'dap'.step_out()<CR>
|
||||
nnoremap <silent> <leader>dbb <cmd>lua require'dap'.toggle_breakpoint()<CR>
|
||||
nnoremap <silent> <leader>dbc <cmd>lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition<cmd> '))<CR>
|
||||
nnoremap <silent> <leader>dbl <cmd>lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message<cmd> '))<CR>
|
||||
nnoremap <silent> <leader>dp <cmd>lua require'dap'.run_last()<CR>
|
||||
nnoremap <silent> <leader>dr <cmd>lua require'dap'.repl.open()<CR>
|
||||
]]
|
||||
local dap = require('dap')
|
||||
|
|
|
|||
|
|
@ -103,19 +103,22 @@ M.gitsigns = function()
|
|||
['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
|
||||
|
||||
['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
|
||||
['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
|
||||
['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
|
||||
['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
|
||||
|
||||
['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
|
||||
['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
|
||||
['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
|
||||
|
||||
['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
|
||||
['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
|
||||
|
||||
['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
|
||||
['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
|
||||
['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
|
||||
|
||||
-- Text objects
|
||||
['o ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>',
|
||||
['x ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>'
|
||||
['o ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>',
|
||||
['x ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>'
|
||||
},
|
||||
watch_index = {
|
||||
interval = 1000,
|
||||
|
|
@ -158,10 +161,15 @@ M.autosession = function()
|
|||
auto_session_enabled = true,
|
||||
auto_save_enabled = false,
|
||||
auto_restore_enabled = true,
|
||||
auto_session_suppress_dirs = nil
|
||||
auto_session_suppress_dirs = nil,
|
||||
}
|
||||
require('auto-session').setup(opts)
|
||||
vim.cmd 'command! SessionSave SaveSession'
|
||||
-- save some more things. notably options, resize, winpos, and terminal
|
||||
vim.o.sessionoptions="blank,buffers,curdir,folds,help,options,tabpages,winsize,resize,winpos,terminal"
|
||||
-- So I don't forget which one it is
|
||||
vim.cmd 'command! SessionSave SaveSession'
|
||||
vim.cmd 'command! SessionDelete DeleteSession'
|
||||
vim.cmd 'command! SessionRestore RestoreSession'
|
||||
end -- <<<
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ return require('packer').startup(function()
|
|||
-- end, 0)
|
||||
-- end,
|
||||
}
|
||||
use { -- DAP: Debug Adapter Protocol >>>
|
||||
use { -- DAP: Debug Adapter Protocol
|
||||
"mfussenegger/nvim-dap",
|
||||
config = function()
|
||||
require("lsp").dap()
|
||||
end
|
||||
}
|
||||
use {
|
||||
use { -- DAP adapter installer
|
||||
"Pocco81/DAPInstall.nvim",
|
||||
config = function()
|
||||
require("lsp").dapinstall()
|
||||
|
|
|
|||
|
|
@ -58,21 +58,24 @@ vim.cmd [[
|
|||
|
||||
""" Key bindings
|
||||
let mapleader = " "
|
||||
" *sigh*...
|
||||
|
||||
" *sigh*...
|
||||
command! Q q
|
||||
command! W w
|
||||
command! Wq wq
|
||||
command! WQ wq
|
||||
" nnoremap ; :
|
||||
" vnoremap ; :
|
||||
" Press Alt h to toggle highlighting on/off, and show current value.
|
||||
|
||||
" Press Alt h to toggle highlighting on/off, and show current value.
|
||||
noremap <M-h> <cmd>set hlsearch! hlsearch?<CR>
|
||||
noremap <M-S> <cmd>set spell! spell?<CR>
|
||||
" Escape to enter normal mode in the terminal
|
||||
|
||||
" Escape to enter normal mode in the terminal
|
||||
tnoremap <Esc> <C-\><C-n>
|
||||
" Replace with alt S
|
||||
|
||||
" Replace with alt S
|
||||
nnoremap <M-s> :%s//g<Left><Left>
|
||||
" Move lines around in visual mode with J and K
|
||||
|
||||
" Move lines around in visual mode with J and K
|
||||
vnoremap J :m '>+1<CR>gv=gv
|
||||
vnoremap K :m '<-2<CR>gv=gv
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue