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
 set mouse=                  " Disable mouse selection
 set winaltkeys=no           " Allow alt key for mapping
 set cursorline
+set whichwrap=b,s
 " set autochdir             " Automatically cd to current file
 
 " 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 @@
 " Last Modified: 2018/05/30 19:20:46
 "
 "======================================================================
-" vim: set ts=4 sw=4 tw=78 noet :
 
 " Open help page in a new tab
 autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif
@@ -158,6 +157,20 @@ augroup InitFileTypesGroup
 
         " markdown 允许自动换行
         au FileType markdown setlocal wrap
+        au FileType markdown set sw=2
+        au FileType markdown set ts=2
+
+  " Fold markdown by heading level
+  function MarkdownLevel()
+    let h = matchstr(getline(v:lnum), '^#\+')
+    if empty(h)
+      return "="
+    else
+      return ">" . len(h)
+    endif
+  endfunction
+  au FileType markdown setlocal foldexpr=MarkdownLevel()
+  au FileType markdown setlocal foldmethod=expr
 
         " lisp 进行微调
         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
 augroup END
 
 " Open terminal
-nnoremap <leader>, :terminal ++noclose<CR>
+" nnoremap <leader>, :terminal ++noclose<CR>
 vnoremap <leader>, :terminal<CR>
 
 " Toggle paste mode on and off
 map <leader>pp :setlocal paste!<cr>
 
 " Switch CDW to root git directory
-nnoremap <Leader>cd :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
+nnoremap <Leader>cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
 " Switch CWD to the directory of the open buffer
-map <leader>cD :cd %:p:h<cr>:pwd<cr>
+map <leader>cd :cd %:p:h<cr>:pwd<cr>
 
 " Move one line up and down
 nnoremap <C-j> ddp
@@ -252,6 +252,7 @@ noremap <leader>l :bn<CR>
 
 " set filetype
 noremap <leader><leader>ft :set filetype=
+noremap <leader><leader>fm :set foldmethod=
 
 " Let <leader>l toggle between this and the last accessed buffer
 let 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
 "set sw=4
 
 " 设置 TAB 宽度
-set ts=4
+set ts=2
 
 " 禁止展开 tab (noexpandtab)
 "set noet
@@ -33,12 +33,3 @@ set ts=4
 set tabstop=4
 set softtabstop=0
 
-
-augroup PythonTab
-        au!
-        " 如果你需要 python 里用 tab，那么反注释下面这行字，否则vim会在打开py文件
-        " 时自动设置成空格缩进。
-        "au FileType python setlocal shiftwidth=4 tabstop=4 noexpandtab
-augroup END
-
-
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 {
       },
     },
   },
+  on_attach = function ()
+    require("telescope").load_extension("aerial")
+  end
 }
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 = {
 -- [ Configure Hop ]
 vim.keymap.set('n', "<space>", ':HopWord<CR>')
 vim.keymap.set('n', '<C-.>', ':HopChar1<CR>')
+
+-- [ Aerial ]
+vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
+vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
+vim.keymap.set("n", "<leader><leader>a", "<cmd>Telescope aerial<CR>")
+vim.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 {
 
   {
     'stevearc/aerial.nvim',
-    lazy = false,
-    event = { "BufReadPost", "BufWritePost", "BufNewFile" },
     opts = {
       on_attach = function(bufnr)
         -- Jump forwards/backwards with '{' and '}'
@@ -206,13 +204,36 @@ return {
   --   end,
   -- },
   --
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "lua-language-server", "stylua",
+        "html-lsp", "css-lsp", "prettier"
+      },
+    },
+  },
+
+  {
+    'numToStr/Comment.nvim',
+    lazy = false,
+    opts = {
+      toggler = {
+        line = '<C-/>',
+        block = 'gb',
+      },
+      opleader = {
+        line = '<C-/>',
+        block = 'gb',
+      },
+    },
+  },
+
+
   -- {
-  --    "williamboman/mason.nvim",
-  --    opts = {
-  --            ensure_installed = {
-  --                    "lua-language-server", "stylua",
-  --                    "html-lsp", "css-lsp" , "prettier"
-  --            },
-  --    },
-  -- },
+  --   'akinsho/bufferline.nvim',
+  --   lazy = false,
+  --   version = "*",
+  --   dependencies = 'nvim-tree/nvim-web-devicons'
+  -- }
 }