From a9386c536189f2aaf38c9e2ba674a096657ca366 Mon Sep 17 00:00:00 2001 From: Hsieh Chin Fan Date: Tue, 17 Sep 2024 11:37:32 +0800 Subject: Update --- vim/init.vim | 2 +- vim/init/basic.vim | 11 +++++++++-- vim/init/highlight.vim | 4 +++- vim/init/keymaps.vim | 10 ++++++---- vim/mini.lua | 9 ++++++++- 5 files changed, 27 insertions(+), 9 deletions(-) (limited to 'vim') diff --git a/vim/init.vim b/vim/init.vim index 59be77e..7e33b6a 100644 --- a/vim/init.vim +++ b/vim/init.vim @@ -31,4 +31,4 @@ endif LoadScript init/highlight.vim -source ~/.projects.vim +silent source ~/.projects.vim diff --git a/vim/init/basic.vim b/vim/init/basic.vim index 37e0abf..79ed3fd 100644 --- a/vim/init/basic.vim +++ b/vim/init/basic.vim @@ -101,7 +101,10 @@ set matchtime=2 set statusline=\ %F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c set laststatus=2 " Always show the status line set ruler " Show cursor position -set wildmenu wildoptions=pum,fuzzy +set wildmenu +if has('nvim') + set wildoptions=pum,fuzzy +endif " Format of error message set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m @@ -110,7 +113,11 @@ set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m set splitright " Set signcolumn -set signcolumn=yes:3 +if has('nvim') + set signcolumn=yes:3 +else + set signcolumn=3 +endif " Custom sign from help page :h sign sign define piet text=>> texthl=Search diff --git a/vim/init/highlight.vim b/vim/init/highlight.vim index 22fe5a3..01f74b8 100644 --- a/vim/init/highlight.vim +++ b/vim/init/highlight.vim @@ -2,7 +2,9 @@ hi LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE " Show trailing spaces -match ExtraWhitespace /\s\+$/ +if has('nvim') + match ExtraWhitespace /\s\+$/ +endif hi ExtraWhitespace ctermbg=red guibg=red hi CursorLine guibg=NONE diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim index bf3d7ab..2d58fe9 100644 --- a/vim/init/keymaps.vim +++ b/vim/init/keymaps.vim @@ -46,10 +46,12 @@ nnoremap q: : " WORKING_DIR {{{ let g:last_path = execute("pwd") -augroup SaveLatestDir - au! - autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0] -augroup END +if has('nvim') + augroup SaveLatestDir + au! + autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0] + augroup END +endif " Switch CWD to the directory of the open buffer nnoremap cd :cd %:p:h:pwd diff --git a/vim/mini.lua b/vim/mini.lua index 0658d4d..177d80a 100644 --- a/vim/mini.lua +++ b/vim/mini.lua @@ -642,7 +642,14 @@ require("lazy").setup({ vim.keymap.set( "n", "sF", - "Telescope find_files follow=true no_ignore=true hidden=true", + function() + require("telescope.builtin").find_files({ + follow = ture, + no_ignore = true, + hidden = true, + file_ignore_patterns = {}, + }) + end, { desc = "telescope find all files" } ) vim.keymap.set("n", "sg", "Telescope live_grep", { desc = "telescope live grep" }) -- cgit v1.2.3-70-g09d2