aboutsummaryrefslogtreecommitdiffhomepage
path: root/vim
diff options
context:
space:
mode:
authorHsieh Chin Fan <pham@topo.tw>2024-09-17 11:37:32 +0800
committerHsieh Chin Fan <pham@topo.tw>2024-10-05 21:07:08 +0800
commita9386c536189f2aaf38c9e2ba674a096657ca366 (patch)
tree6605acf1f3c0587efc1355aed3b440f48fe1354f /vim
parent4ee76734de1d426df88a2a4791391909cd1a8597 (diff)
Update
Diffstat (limited to 'vim')
-rw-r--r--vim/init.vim2
-rw-r--r--vim/init/basic.vim11
-rw-r--r--vim/init/highlight.vim4
-rw-r--r--vim/init/keymaps.vim10
-rw-r--r--vim/mini.lua9
5 files changed, 27 insertions, 9 deletions
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
31 31
32LoadScript init/highlight.vim 32LoadScript init/highlight.vim
33 33
34source ~/.projects.vim 34silent 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
101set statusline=\ %F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c 101set statusline=\ %F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c
102set laststatus=2 " Always show the status line 102set laststatus=2 " Always show the status line
103set ruler " Show cursor position 103set ruler " Show cursor position
104set wildmenu wildoptions=pum,fuzzy 104set wildmenu
105if has('nvim')
106 set wildoptions=pum,fuzzy
107endif
105 108
106" Format of error message 109" Format of error message
107set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m 110set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
@@ -110,7 +113,11 @@ set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
110set splitright 113set splitright
111 114
112" Set signcolumn 115" Set signcolumn
113set signcolumn=yes:3 116if has('nvim')
117 set signcolumn=yes:3
118else
119 set signcolumn=3
120endif
114" Custom sign from help page :h sign 121" Custom sign from help page :h sign
115sign define piet text=>> texthl=Search 122sign define piet text=>> texthl=Search
116 123
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 @@
2hi LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE 2hi LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
3 3
4" Show trailing spaces 4" Show trailing spaces
5match ExtraWhitespace /\s\+$/ 5if has('nvim')
6 match ExtraWhitespace /\s\+$/
7endif
6hi ExtraWhitespace ctermbg=red guibg=red 8hi ExtraWhitespace ctermbg=red guibg=red
7 9
8hi CursorLine guibg=NONE 10hi 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: :
46" WORKING_DIR {{{ 46" WORKING_DIR {{{
47 47
48let g:last_path = execute("pwd") 48let g:last_path = execute("pwd")
49augroup SaveLatestDir 49if has('nvim')
50 au! 50 augroup SaveLatestDir
51 autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0] 51 au!
52augroup END 52 autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0]
53 augroup END
54endif
53 55
54" Switch CWD to the directory of the open buffer 56" Switch CWD to the directory of the open buffer
55nnoremap cd :cd %:p:h<CR>:pwd<CR> 57nnoremap cd :cd %:p:h<CR>:pwd<CR>
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({
642 vim.keymap.set( 642 vim.keymap.set(
643 "n", 643 "n",
644 "<leader>sF", 644 "<leader>sF",
645 "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>", 645 function()
646 require("telescope.builtin").find_files({
647 follow = ture,
648 no_ignore = true,
649 hidden = true,
650 file_ignore_patterns = {},
651 })
652 end,
646 { desc = "telescope find all files" } 653 { desc = "telescope find all files" }
647 ) 654 )
648 vim.keymap.set("n", "<leader>sg", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" }) 655 vim.keymap.set("n", "<leader>sg", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })