aboutsummaryrefslogtreecommitdiffhomepage
path: root/vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim')
-rw-r--r--vim/init/basic.vim1
-rw-r--r--vim/init/config.vim15
-rw-r--r--vim/init/keymaps.vim7
-rw-r--r--vim/init/tabsize.vim11
-rw-r--r--vim/lua/configs/telescope.lua3
-rw-r--r--vim/lua/mappings.lua6
-rw-r--r--vim/lua/plugins/init.lua41
7 files changed, 60 insertions, 24 deletions
diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index d90bfc0..a6d07dc 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -27,6 +27,7 @@ set path=.,** " Allow :find with completion
27set mouse= " Disable mouse selection 27set mouse= " Disable mouse selection
28set winaltkeys=no " Allow alt key for mapping 28set winaltkeys=no " Allow alt key for mapping
29set cursorline 29set cursorline
30set whichwrap=b,s
30" set autochdir " Automatically cd to current file 31" set autochdir " Automatically cd to current file
31 32
32" Turn persistent undo on 33" Turn persistent undo on
diff --git a/vim/init/config.vim b/vim/init/config.vim
index 7e08ebf..07bed12 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -6,7 +6,6 @@
6" Last Modified: 2018/05/30 19:20:46 6" Last Modified: 2018/05/30 19:20:46
7" 7"
8"====================================================================== 8"======================================================================
9" vim: set ts=4 sw=4 tw=78 noet :
10 9
11" Open help page in a new tab 10" Open help page in a new tab
12autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif 11autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif
@@ -158,6 +157,20 @@ augroup InitFileTypesGroup
158 157
159 " markdown 允许自动换行 158 " markdown 允许自动换行
160 au FileType markdown setlocal wrap 159 au FileType markdown setlocal wrap
160 au FileType markdown set sw=2
161 au FileType markdown set ts=2
162
163 " Fold markdown by heading level
164 function MarkdownLevel()
165 let h = matchstr(getline(v:lnum), '^#\+')
166 if empty(h)
167 return "="
168 else
169 return ">" . len(h)
170 endif
171 endfunction
172 au FileType markdown setlocal foldexpr=MarkdownLevel()
173 au FileType markdown setlocal foldmethod=expr
161 174
162 " lisp 进行微调 175 " lisp 进行微调
163 au FileType lisp setlocal ts=8 sts=2 sw=2 et 176 au FileType lisp setlocal ts=8 sts=2 sw=2 et
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 9d1003b..211a0d1 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -71,16 +71,16 @@ augroup vimrc_CRfix
71augroup END 71augroup END
72 72
73" Open terminal 73" Open terminal
74nnoremap <leader>, :terminal ++noclose<CR> 74" nnoremap <leader>, :terminal ++noclose<CR>
75vnoremap <leader>, :terminal<CR> 75vnoremap <leader>, :terminal<CR>
76 76
77" Toggle paste mode on and off 77" Toggle paste mode on and off
78map <leader>pp :setlocal paste!<cr> 78map <leader>pp :setlocal paste!<cr>
79 79
80" Switch CDW to root git directory 80" Switch CDW to root git directory
81nnoremap <Leader>cd :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR> 81nnoremap <Leader>cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
82" Switch CWD to the directory of the open buffer 82" Switch CWD to the directory of the open buffer
83map <leader>cD :cd %:p:h<cr>:pwd<cr> 83map <leader>cd :cd %:p:h<cr>:pwd<cr>
84 84
85" Move one line up and down 85" Move one line up and down
86nnoremap <C-j> ddp 86nnoremap <C-j> ddp
@@ -252,6 +252,7 @@ noremap <leader>l :bn<CR>
252 252
253" set filetype 253" set filetype
254noremap <leader><leader>ft :set filetype= 254noremap <leader><leader>ft :set filetype=
255noremap <leader><leader>fm :set foldmethod=
255 256
256" Let <leader>l toggle between this and the last accessed buffer 257" Let <leader>l toggle between this and the last accessed buffer
257let g:lastbuffer = 1 258let g:lastbuffer = 1
diff --git a/vim/init/tabsize.vim b/vim/init/tabsize.vim
index b383b80..6cb0f63 100644
--- a/vim/init/tabsize.vim
+++ b/vim/init/tabsize.vim
@@ -24,7 +24,7 @@ set smartindent
24"set sw=4 24"set sw=4
25 25
26" 设置 TAB 宽度 26" 设置 TAB 宽度
27set ts=4 27set ts=2
28 28
29" 禁止展开 tab (noexpandtab) 29" 禁止展开 tab (noexpandtab)
30"set noet 30"set noet
@@ -33,12 +33,3 @@ set ts=4
33set tabstop=4 33set tabstop=4
34set softtabstop=0 34set softtabstop=0
35 35
36
37augroup PythonTab
38 au!
39 " 如果你需要 python 里用 tab,那么反注释下面这行字,否则vim会在打开py文件
40 " 时自动设置成空格缩进。
41 "au FileType python setlocal shiftwidth=4 tabstop=4 noexpandtab
42augroup END
43
44
diff --git a/vim/lua/configs/telescope.lua b/vim/lua/configs/telescope.lua
index 73c64e5..60828e9 100644
--- a/vim/lua/configs/telescope.lua
+++ b/vim/lua/configs/telescope.lua
@@ -45,4 +45,7 @@ return {
45 }, 45 },
46 }, 46 },
47 }, 47 },
48 on_attach = function ()
49 require("telescope").load_extension("aerial")
50 end
48} 51}
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index f6ef8c4..7408708 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -168,3 +168,9 @@ vim.g.mkdp_preview_options = {
168-- [ Configure Hop ] 168-- [ Configure Hop ]
169vim.keymap.set('n', "<space>", ':HopWord<CR>') 169vim.keymap.set('n', "<space>", ':HopWord<CR>')
170vim.keymap.set('n', '<C-.>', ':HopChar1<CR>') 170vim.keymap.set('n', '<C-.>', ':HopChar1<CR>')
171
172-- [ Aerial ]
173vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
174vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
175vim.keymap.set("n", "<leader><leader>a", "<cmd>Telescope aerial<CR>")
176vim.keymap.set("n", "<leader><leader>A", "<cmd>AerialToggle!left<CR>")
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index 132f1a2..5e00a5b 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -166,8 +166,6 @@ return {
166 166
167 { 167 {
168 'stevearc/aerial.nvim', 168 'stevearc/aerial.nvim',
169 lazy = false,
170 event = { "BufReadPost", "BufWritePost", "BufNewFile" },
171 opts = { 169 opts = {
172 on_attach = function(bufnr) 170 on_attach = function(bufnr)
173 -- Jump forwards/backwards with '{' and '}' 171 -- Jump forwards/backwards with '{' and '}'
@@ -206,13 +204,36 @@ return {
206 -- end, 204 -- end,
207 -- }, 205 -- },
208 -- 206 --
207 {
208 "williamboman/mason.nvim",
209 opts = {
210 ensure_installed = {
211 "lua-language-server", "stylua",
212 "html-lsp", "css-lsp", "prettier"
213 },
214 },
215 },
216
217 {
218 'numToStr/Comment.nvim',
219 lazy = false,
220 opts = {
221 toggler = {
222 line = '<C-/>',
223 block = 'gb',
224 },
225 opleader = {
226 line = '<C-/>',
227 block = 'gb',
228 },
229 },
230 },
231
232
209 -- { 233 -- {
210 -- "williamboman/mason.nvim", 234 -- 'akinsho/bufferline.nvim',
211 -- opts = { 235 -- lazy = false,
212 -- ensure_installed = { 236 -- version = "*",
213 -- "lua-language-server", "stylua", 237 -- dependencies = 'nvim-tree/nvim-web-devicons'
214 -- "html-lsp", "css-lsp" , "prettier" 238 -- }
215 -- },
216 -- },
217 -- },
218} 239}