From 593d27f3334065d8e72353e60b299e75835d49da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Kmie=C4=87?= Date: Sun, 2 Apr 2023 23:16:37 +0200 Subject: [PATCH] Nvim: add nvim-buddy --- .config/nvim/after/available/airline.rc.lua | 5 -- .config/nvim/after/available/digraphs.rc.vim | 0 .config/nvim/after/available/hlslens.rc.vim | 11 ---- .../nvim/after/available/md-preview.rc.vim | 1 - .config/nvim/after/available/neorg.rc.lua | 14 ----- .config/nvim/after/available/other.rc.lua | 57 ------------------- .../nvim/after/available/screenshot.rc.lua | 43 -------------- .../nvim/after/available/search-pulse.rc.vim | 2 - .config/nvim/after/available/startify.rc.vim | 1 - .config/nvim/after/available/toggler.rc.lua | 7 --- .config/nvim/after/available/vim-test.rc.vim | 7 --- .../nvim/after/available/virt-column.rc.vim | 0 .config/nvim/after/available/window.rc.lua | 8 --- .../ftplugin/markdown/markdown_spell.vim | 1 - .config/nvim/after/ftplugin/spell.vim | 3 - .../after/ftplugin/vimwiki/vimwiki_spell.vim | 1 - .config/nvim/lua/core/mappings.lua | 6 +- .config/nvim/lua/plugins/lspconfig.lua | 4 ++ .config/nvim/lua/plugins/navbuddy.lua | 12 ++++ 19 files changed, 20 insertions(+), 163 deletions(-) delete mode 100644 .config/nvim/after/available/airline.rc.lua delete mode 100644 .config/nvim/after/available/digraphs.rc.vim delete mode 100644 .config/nvim/after/available/hlslens.rc.vim delete mode 100644 .config/nvim/after/available/md-preview.rc.vim delete mode 100644 .config/nvim/after/available/neorg.rc.lua delete mode 100644 .config/nvim/after/available/other.rc.lua delete mode 100644 .config/nvim/after/available/screenshot.rc.lua delete mode 100644 .config/nvim/after/available/search-pulse.rc.vim delete mode 100644 .config/nvim/after/available/startify.rc.vim delete mode 100644 .config/nvim/after/available/toggler.rc.lua delete mode 100644 .config/nvim/after/available/vim-test.rc.vim delete mode 100644 .config/nvim/after/available/virt-column.rc.vim delete mode 100644 .config/nvim/after/available/window.rc.lua delete mode 120000 .config/nvim/after/ftplugin/markdown/markdown_spell.vim delete mode 100644 .config/nvim/after/ftplugin/spell.vim delete mode 120000 .config/nvim/after/ftplugin/vimwiki/vimwiki_spell.vim create mode 100644 .config/nvim/lua/plugins/navbuddy.lua diff --git a/.config/nvim/after/available/airline.rc.lua b/.config/nvim/after/available/airline.rc.lua deleted file mode 100644 index ea239f2..0000000 --- a/.config/nvim/after/available/airline.rc.lua +++ /dev/null @@ -1,5 +0,0 @@ -vim.g.airline_theme = 'minimalist' -vim.g.airline_powerline_fonts = 1 -vim.g.airline_stl_path_style = 'short' -vim.g.airline_highlighting_cache = 1 -vim.g.airline#extensions#searchcount#enabled = 0 diff --git a/.config/nvim/after/available/digraphs.rc.vim b/.config/nvim/after/available/digraphs.rc.vim deleted file mode 100644 index e69de29..0000000 diff --git a/.config/nvim/after/available/hlslens.rc.vim b/.config/nvim/after/available/hlslens.rc.vim deleted file mode 100644 index f9c5b95..0000000 --- a/.config/nvim/after/available/hlslens.rc.vim +++ /dev/null @@ -1,11 +0,0 @@ -"noremap n execute('normal! ' . v:count1 . 'n') -" \lua require('hlslens').start() -"noremap N execute('normal! ' . v:count1 . 'N') -" \lua require('hlslens').start() -"noremap * *lua require('hlslens').start() -"noremap # #lua require('hlslens').start() -"noremap g* g*lua require('hlslens').start() -"noremap g# g#lua require('hlslens').start() -" -"" use : instead of -"nnoremap l :noh diff --git a/.config/nvim/after/available/md-preview.rc.vim b/.config/nvim/after/available/md-preview.rc.vim deleted file mode 100644 index 3e866c8..0000000 --- a/.config/nvim/after/available/md-preview.rc.vim +++ /dev/null @@ -1 +0,0 @@ -let g:mkdp_filetypes = ['markdown', 'plantuml'] diff --git a/.config/nvim/after/available/neorg.rc.lua b/.config/nvim/after/available/neorg.rc.lua deleted file mode 100644 index d34447e..0000000 --- a/.config/nvim/after/available/neorg.rc.lua +++ /dev/null @@ -1,14 +0,0 @@ -require('neorg').setup { - load = { - ["core.defaults"] = {}, - ["core.norg.dirman"] = { - config = { - workspaces = { - work = "~/notes/work", - home = "~/notes/home", - } - } - }, - ["core.norg.concealer"] = {}, - } -} diff --git a/.config/nvim/after/available/other.rc.lua b/.config/nvim/after/available/other.rc.lua deleted file mode 100644 index 3d4d5be..0000000 --- a/.config/nvim/after/available/other.rc.lua +++ /dev/null @@ -1,57 +0,0 @@ --- Plug 'rgroli/other.nvim' -require("other-nvim").setup({ - mappings = { - -- custom mapping - { - pattern = "/src/(.*).cpp$", - target = "/include/%1.hpp", - transformer = "lowercase", - context = "header" - }, - { - pattern = "/src/(.*).cpp$", - target = "/include/%1.h", - transformer = "lowercase", - context = "header" - }, - { - pattern = "/src/(.*).hpp$", - target = "/include/%1.cpp", - transformer = "lowercase", - context = "source" - }, - { - pattern = "/include/(.*).hpp$", - target = "/src/%1.cpp", - transformer = "lowercase", - context = "source" - }, - { - pattern = "/include/(.*).h$", - target = "/src/%1.cpp", - transformer = "lowercase", - context = "source" - } - }, - transformers = { - -- defining a custom transformer - lowercase = function (inputString) - return inputString:lower() - end - }, - style = { - -- How the plugin paints its window borders - -- Allowed values are none, single, double, rounded, solid and shadow - border = "solid", - - -- Column seperator for the window - seperator = "|", - - -- width of the window in percent. e.g. 0.5 is 50%, is 100% - width = 0.7, - - -- min height in rows. - -- when more columns are needed this value is extended automatically - minHeight = 2 - }, -}) diff --git a/.config/nvim/after/available/screenshot.rc.lua b/.config/nvim/after/available/screenshot.rc.lua deleted file mode 100644 index b763300..0000000 --- a/.config/nvim/after/available/screenshot.rc.lua +++ /dev/null @@ -1,43 +0,0 @@ ---Plug 'nvim-lua/plenary.nvim' ---Plug 'narutoxy/silicon.lua' - --- Not working well --- silicon = require('silicon') --- silicon.setup( --- { --- theme = "auto", --- output = "SILICON_${year}-${month}-${date}_${time}.png", -- auto generate file name based on time (absolute or relative to cwd) --- bgColor = vim.g.terminal_color_5, --- bgImage = "", -- path to image, must be png --- roundCorner = true, --- windowControls = true, --- lineNumber = true, --- font = "monospace", --- lineOffset = 1, -- from where to start line number --- linePad = 2, -- padding between lines --- padHoriz = 80, -- Horizontal padding --- padVert = 100, -- vertical padding --- shadowBlurRadius = 10, --- shadowColor = "#555555", --- shadowOffsetX = 8, --- shadowOffsetY = 8, --- gobble = false, -- enable lsautogobble like feature --- debug = true, -- enable debug output --- } --- ) --- --- -- Generate image of lines in a visual selection --- vim.keymap.set('v', 's', function() silicon.visualise_api({to_clip = false, show_buf = false}) end ) --- -- Generate image of a whole buffer, with lines in a visual selection highlighted --- vim.keymap.set('v', 'bs', function() silicon.visualise_api({to_clip = false, show_buf = true}) end ) --- -- Generate visible portion of a buffer --- --vim.keymap.set('n', 's', function() silicon.visualise_api({to_clip = true, visible = true}) end ) --- -- Generate current buffer line in normal mode --- --vim.keymap.set('n', 's', function() silicon.visualise_api({to_clip = true}) end ) - - --- Time for silicon.nvim -require('silicon').setup({ - font = 'FantasqueSansMono Nerd Font=16', - theme = 'Monokai Extended', -}) diff --git a/.config/nvim/after/available/search-pulse.rc.vim b/.config/nvim/after/available/search-pulse.rc.vim deleted file mode 100644 index 56fbd58..0000000 --- a/.config/nvim/after/available/search-pulse.rc.vim +++ /dev/null @@ -1,2 +0,0 @@ -let g:vim_search_pulse_mode = 'pattern' -let g:vim_search_pulse_duration = 400 diff --git a/.config/nvim/after/available/startify.rc.vim b/.config/nvim/after/available/startify.rc.vim deleted file mode 100644 index 9a67c9e..0000000 --- a/.config/nvim/after/available/startify.rc.vim +++ /dev/null @@ -1 +0,0 @@ -let g:startify_custom_header = '' diff --git a/.config/nvim/after/available/toggler.rc.lua b/.config/nvim/after/available/toggler.rc.lua deleted file mode 100644 index d2d8393..0000000 --- a/.config/nvim/after/available/toggler.rc.lua +++ /dev/null @@ -1,7 +0,0 @@ -require('nvim-toggler').setup({ - inverses = { - ['vim'] = 'emacs' - }, - -- removes the default i keymap - remove_default_keybinds = true, -}) diff --git a/.config/nvim/after/available/vim-test.rc.vim b/.config/nvim/after/available/vim-test.rc.vim deleted file mode 100644 index 21f5c47..0000000 --- a/.config/nvim/after/available/vim-test.rc.vim +++ /dev/null @@ -1,7 +0,0 @@ -"nmap tn :TestNearest -"nmap tf :TestFile -"nmap ts :TestSuite -"nmap tl :TestLast -"nmap tv :TestVisit -" -"let test#strategy = "floaterm" diff --git a/.config/nvim/after/available/virt-column.rc.vim b/.config/nvim/after/available/virt-column.rc.vim deleted file mode 100644 index e69de29..0000000 diff --git a/.config/nvim/after/available/window.rc.lua b/.config/nvim/after/available/window.rc.lua deleted file mode 100644 index 1ceab05..0000000 --- a/.config/nvim/after/available/window.rc.lua +++ /dev/null @@ -1,8 +0,0 @@ -require('nvim-window').setup({ - chars = { - 'j', 'k', 'l', 'f', 'd', 's', 'g', 'h', 'i', 'e', 'a', 'b', 'm', 'n', 'o', - 'p', 'q', 'r', 'c', 't', 'u', 'v', 'w', 'x', 'y', 'z' - }, -}) - -vim.api.nvim_set_keymap('n', 'j', 'lua require("nvim-window").pick()', {silent=true, noremap = true}) diff --git a/.config/nvim/after/ftplugin/markdown/markdown_spell.vim b/.config/nvim/after/ftplugin/markdown/markdown_spell.vim deleted file mode 120000 index db997e2..0000000 --- a/.config/nvim/after/ftplugin/markdown/markdown_spell.vim +++ /dev/null @@ -1 +0,0 @@ -../spell.vim \ No newline at end of file diff --git a/.config/nvim/after/ftplugin/spell.vim b/.config/nvim/after/ftplugin/spell.vim deleted file mode 100644 index c70c60e..0000000 --- a/.config/nvim/after/ftplugin/spell.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal spell -" Undo changes when switching to different buffer -"let b:undo_ftplugin .= '|setlocal spell<' diff --git a/.config/nvim/after/ftplugin/vimwiki/vimwiki_spell.vim b/.config/nvim/after/ftplugin/vimwiki/vimwiki_spell.vim deleted file mode 120000 index db997e2..0000000 --- a/.config/nvim/after/ftplugin/vimwiki/vimwiki_spell.vim +++ /dev/null @@ -1 +0,0 @@ -../spell.vim \ No newline at end of file diff --git a/.config/nvim/lua/core/mappings.lua b/.config/nvim/lua/core/mappings.lua index 9915919..102446d 100644 --- a/.config/nvim/lua/core/mappings.lua +++ b/.config/nvim/lua/core/mappings.lua @@ -102,8 +102,10 @@ map('n', '=', "") -- specs -- You can even bind it to search jumping and more, example: -vim.api.nvim_set_keymap('n', 'n', 'n:lua require("specs").show_specs()', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'N', 'N:lua require("specs").show_specs()', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'n', 'n:lua require("specs").show_specs()', default_options) +vim.api.nvim_set_keymap('n', 'N', 'N:lua require("specs").show_specs()', default_options) -- Or maybe you do a lot of screen-casts and want to call attention to a specific line of code: vim.api.nvim_set_keymap('n', 'v', ':lua require("specs").show_specs({width = 97, winhl = "Search", delay_ms = 610, inc_ms = 21})', { noremap = true, silent = true }) + +vim.api.nvim_set_keymap('n', 'cb', ':lua require("nvim-navbuddy").open()', default_options) diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index 767716e..6964049 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -1,5 +1,8 @@ return { 'neovim/nvim-lspconfig', + requires = { + "SmiteshP/nvim-navbuddy", + }, config = function() local nvim_lsp = require('lspconfig') local clangd_extensions = require('clangd_extensions') @@ -42,6 +45,7 @@ return { floating_window_off_x = 500, floating_window_off_y = -5, }) + require'nvim-navbuddy'.attach(client, bufnr) end local signs = { diff --git a/.config/nvim/lua/plugins/navbuddy.lua b/.config/nvim/lua/plugins/navbuddy.lua new file mode 100644 index 0000000..d4abd00 --- /dev/null +++ b/.config/nvim/lua/plugins/navbuddy.lua @@ -0,0 +1,12 @@ +return { + "SmiteshP/nvim-navbuddy", + dependencies = { + "neovim/nvim-lspconfig", + "SmiteshP/nvim-navic", + "MunifTanjim/nui.nvim" + }, + config = function() + require'nvim-navic'.setup() + require'nvim-navbuddy'.setup() + end +}