From cbd7159754e5656d44801c10c3ad51c69033d803 Mon Sep 17 00:00:00 2001 From: iGor milhit Date: Fri, 6 Oct 2023 09:47:39 +0200 Subject: [PATCH] plugins: improve config, remove unused plugins - Updates the configuration according to the indent blankline plugin version 3. - Removes the ZenMode plugin as I should have done long ago. - Lazy loads the Rainbow CSV plugin. - Adds a keymap (ch) for the command history picker of telescope. - Removes the kickstart big comment on top of the init.lua file. - Removes the config file that I don't remember the utility. Co-Authored-by: iGor milhit --- config | 156 ----------------------------- init.lua | 49 ++------- lua/custom/plugins/rainbow-csv.lua | 1 + lua/custom/plugins/zen-mode.lua | 39 -------- 4 files changed, 10 insertions(+), 235 deletions(-) delete mode 100644 config delete mode 100644 lua/custom/plugins/zen-mode.lua diff --git a/config b/config deleted file mode 100644 index 35b1541..0000000 --- a/config +++ /dev/null @@ -1,156 +0,0 @@ -let SessionLoad = 1 -let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1 -let v:this_session=expand(":p") -silent only -silent tabonly -cd ~/neovim -if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' - let s:wipebuf = bufnr('%') -endif -let s:shortmess_save = &shortmess -if &shortmess =~ 'A' - set shortmess=aoOA -else - set shortmess=aoO -endif -badd +1 README.md -badd +150 init.lua -badd +0 term://~/neovim//59689:/usr/bin/zsh -badd +0 lua/custom/plugins/markdownpreview.lua -argglobal -%argdel -$argadd README.md -edit lua/custom/plugins/markdownpreview.lua -let s:save_splitbelow = &splitbelow -let s:save_splitright = &splitright -set splitbelow splitright -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -wincmd _ | wincmd | -split -1wincmd k -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -wincmd w -let &splitbelow = s:save_splitbelow -let &splitright = s:save_splitright -wincmd t -let s:save_winminheight = &winminheight -let s:save_winminwidth = &winminwidth -set winminheight=0 -set winheight=1 -set winminwidth=0 -set winwidth=1 -exe 'vert 1resize ' . ((&columns * 40 + 106) / 213) -exe '2resize ' . ((&lines * 34 + 24) / 48) -exe 'vert 2resize ' . ((&columns * 86 + 106) / 213) -exe '3resize ' . ((&lines * 34 + 24) / 48) -exe 'vert 3resize ' . ((&columns * 85 + 106) / 213) -exe '4resize ' . ((&lines * 11 + 24) / 48) -exe 'vert 4resize ' . ((&columns * 172 + 106) / 213) -argglobal -enew -file neo-tree\ filesystem\ \[1] -balt init.lua -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -wincmd w -argglobal -balt init.lua -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -silent! normal! zE -let &fdl = &fdl -let s:l = 1 - ((0 * winheight(0) + 17) / 34) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 1 -normal! 0 -wincmd w -argglobal -if bufexists(fnamemodify("init.lua", ":p")) | buffer init.lua | else | edit init.lua | endif -if &buftype ==# 'terminal' - silent file init.lua -endif -balt lua/custom/plugins/markdownpreview.lua -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -silent! normal! zE -let &fdl = &fdl -let s:l = 150 - ((22 * winheight(0) + 17) / 34) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 150 -normal! 031| -wincmd w -argglobal -if bufexists(fnamemodify("term://~/neovim//59689:/usr/bin/zsh", ":p")) | buffer term://~/neovim//59689:/usr/bin/zsh | else | edit term://~/neovim//59689:/usr/bin/zsh | endif -if &buftype ==# 'terminal' - silent file term://~/neovim//59689:/usr/bin/zsh -endif -balt init.lua -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -let s:l = 5 - ((2 * winheight(0) + 5) / 11) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 5 -normal! 03| -wincmd w -3wincmd w -exe 'vert 1resize ' . ((&columns * 40 + 106) / 213) -exe '2resize ' . ((&lines * 34 + 24) / 48) -exe 'vert 2resize ' . ((&columns * 86 + 106) / 213) -exe '3resize ' . ((&lines * 34 + 24) / 48) -exe 'vert 3resize ' . ((&columns * 85 + 106) / 213) -exe '4resize ' . ((&lines * 11 + 24) / 48) -exe 'vert 4resize ' . ((&columns * 172 + 106) / 213) -tabnext 1 -if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' - silent exe 'bwipe ' . s:wipebuf -endif -unlet! s:wipebuf -set winheight=1 winwidth=20 -let &shortmess = s:shortmess_save -let &winminheight = s:save_winminheight -let &winminwidth = s:save_winminwidth -let s:sx = expand(":p:r")."x.vim" -if filereadable(s:sx) - exe "source " . fnameescape(s:sx) -endif -let &g:so = s:so_save | let &g:siso = s:siso_save -nohlsearch -doautoall SessionLoadPost -unlet SessionLoad -" vim: set ft=vim : diff --git a/init.lua b/init.lua index 47c6f97..ced3256 100644 --- a/init.lua +++ b/init.lua @@ -1,41 +1,3 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== - -Kickstart.nvim is *not* a distribution. - -Kickstart.nvim is a template for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you should start exploring, configuring and tinkering to - explore Neovim! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example: - - https://learnxinyminutes.com/docs/lua/ - - And then you can explore or search through `:help lua-guide` - - -Kickstart Guide: - -I have left several `:help X` comments throughout the init.lua -You should run that command and read that help section for more information. - -In addition, I have some `NOTE:` items throughout the file. -These are for you, the reader to help understand what is happening. Feel free to delete -them once you know what you're doing, but they should serve as a guide for when you -are first encountering a few different constructs in your nvim config. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now :) ---]] - -- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) @@ -173,9 +135,10 @@ require('lazy').setup({ 'lukas-reineke/indent-blankline.nvim', -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help indent_blankline.txt` + main = "ibl", opts = { - char = '┊', - show_trailing_blankline_indent = false, + indent = {char = '┊'}, + whitespace = {remove_blankline_trail = false}, }, }, @@ -329,6 +292,11 @@ require('telescope').setup { }, }, }, + pickers = { + command_history = { + theme = "dropdown", + } + } } -- Enable telescope fzf native, if installed @@ -356,6 +324,7 @@ vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { de vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set('n', 'sb', require('telescope.builtin').buffers, { desc = '[S]earch [B]uffers' }) +vim.keymap.set('n', 'ch', require('telescope.builtin').command_history, { desc = '[C]command [H]istory' }) vim.keymap.set('n', 'ss', require'telescope'.extensions.luasnip.luasnip , { desc = '[S]earch [S]nippets' }) -- [[ Configure Treesitter ]] diff --git a/lua/custom/plugins/rainbow-csv.lua b/lua/custom/plugins/rainbow-csv.lua index e283dcf..148793f 100644 --- a/lua/custom/plugins/rainbow-csv.lua +++ b/lua/custom/plugins/rainbow-csv.lua @@ -2,6 +2,7 @@ return { 'cameron-wags/rainbow_csv.nvim', + lazy = true, config = true, ft = { 'csv', diff --git a/lua/custom/plugins/zen-mode.lua b/lua/custom/plugins/zen-mode.lua deleted file mode 100644 index 5244601..0000000 --- a/lua/custom/plugins/zen-mode.lua +++ /dev/null @@ -1,39 +0,0 @@ --- Zen mode with twilight. --- Improves the edition experience with distraction free feature. - -return { - "folke/zen-mode.nvim", - ft = { - "markdown", - "pandoc" - }, - -- Twilight allows to dim text outside of the cursor line. - dependencies = { - "folke/twilight.nvim", - opts = { - -- Set the context to null in order to avoid highlighting to much - -- paragraphs in markdown. - context = 0, - }, - }, - opts = { - window = { - -- Set the window width (85 columns) and height (80%). - width = 85, - height = .8, - options = { - -- Disable line numbering, signcolumn and colorcolumn. - number = false, - signcolumn = "no", - }, - }, - plugins = { - options = { - enabled = true, - ruler = false, - showcmd = false, - }, - gitsigns = { enabled = false }, - }, - }, -}