diff options
Diffstat (limited to '.config/nvim/lua/plugin_settings.lua')
-rw-r--r-- | .config/nvim/lua/plugin_settings.lua | 83 |
1 files changed, 76 insertions, 7 deletions
diff --git a/.config/nvim/lua/plugin_settings.lua b/.config/nvim/lua/plugin_settings.lua index 1f39e5f..277e196 100644 --- a/.config/nvim/lua/plugin_settings.lua +++ b/.config/nvim/lua/plugin_settings.lua | |||
@@ -242,12 +242,12 @@ require('telescope').load_extension('fzf') | |||
242 | -- }}} telescope -- | 242 | -- }}} telescope -- |
243 | 243 | ||
244 | -- dashboard {{{ -- | 244 | -- dashboard {{{ -- |
245 | g.dashboard_default_executive = 'telescope' | 245 | g.dashboard_default_executive = 'telescope' |
246 | g.dashboard_preview_command = 'cat' | 246 | g.dashboard_preview_command = 'cat' |
247 | g.dashboard_preview_pipeline = 'lolcat' | 247 | g.dashboard_preview_file = '~/.config/nvim/neovim.cat' |
248 | g.dashboard_preview_file = '~/.config/nvim/neovim.cat' | 248 | g.dashboard_preview_file_height = 13 |
249 | g.dashboard_preview_file_height = 14 | 249 | g.dashboard_preview_file_width = 90 |
250 | g.dashboard_preview_file_width = 90 | 250 | g.dashboard_footer_icon = '💃 ' |
251 | 251 | ||
252 | g.dashboard_custom_shortcut = { | 252 | g.dashboard_custom_shortcut = { |
253 | last_session = '<leader> s l', | 253 | last_session = '<leader> s l', |
@@ -304,7 +304,6 @@ cmp.setup({ | |||
304 | { name = 'nvim_lsp' }, | 304 | { name = 'nvim_lsp' }, |
305 | { name = 'ultisnips' }, | 305 | { name = 'ultisnips' }, |
306 | { name = 'buffer' }, | 306 | { name = 'buffer' }, |
307 | { name = "latex_symbols" }, | ||
308 | } | 307 | } |
309 | }) | 308 | }) |
310 | 309 | ||
@@ -469,3 +468,73 @@ require'nvim-tree'.setup { | |||
469 | -- nvim-colorizer {{{ -- | 468 | -- nvim-colorizer {{{ -- |
470 | require 'colorizer'.setup() | 469 | require 'colorizer'.setup() |
471 | -- }}} nvim-colorizer -- | 470 | -- }}} nvim-colorizer -- |
471 | |||
472 | -- gitsigns.nvim {{{ -- | ||
473 | |||
474 | require('gitsigns').setup { | ||
475 | signs = { | ||
476 | add = {hl = 'GitSignsAdd' , text = '│', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'}, | ||
477 | change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, | ||
478 | delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, | ||
479 | topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, | ||
480 | changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, | ||
481 | |||
482 | }, | ||
483 | signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` | ||
484 | numhl = false, -- Toggle with `:Gitsigns toggle_numhl` | ||
485 | linehl = false, -- Toggle with `:Gitsigns toggle_linehl` | ||
486 | word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` | ||
487 | keymaps = { | ||
488 | -- Default keymap options | ||
489 | noremap = true, | ||
490 | |||
491 | ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"}, | ||
492 | ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"}, | ||
493 | |||
494 | ['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>', | ||
495 | ['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>', | ||
496 | ['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>', | ||
497 | ['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>', | ||
498 | ['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>', | ||
499 | ['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>', | ||
500 | ['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>', | ||
501 | ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>', | ||
502 | ['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>', | ||
503 | ['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>', | ||
504 | |||
505 | -- Text objects | ||
506 | ['o ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>', | ||
507 | ['x ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>' | ||
508 | }, | ||
509 | watch_gitdir = { | ||
510 | interval = 1000, | ||
511 | follow_files = true | ||
512 | }, | ||
513 | attach_to_untracked = true, | ||
514 | current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` | ||
515 | current_line_blame_opts = { | ||
516 | virt_text = true, | ||
517 | virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' | ||
518 | delay = 1000, | ||
519 | }, | ||
520 | current_line_blame_formatter_opts = { | ||
521 | relative_time = false | ||
522 | }, | ||
523 | sign_priority = 6, | ||
524 | update_debounce = 100, | ||
525 | status_formatter = nil, -- Use default | ||
526 | max_file_length = 40000, | ||
527 | preview_config = { | ||
528 | -- Options passed to nvim_open_win | ||
529 | border = 'single', | ||
530 | style = 'minimal', | ||
531 | relative = 'cursor', | ||
532 | row = 0, | ||
533 | col = 1 | ||
534 | }, | ||
535 | yadm = { | ||
536 | enable = true | ||
537 | }, | ||
538 | } | ||
539 | |||
540 | -- }}} gitsigns.nvim -- | ||