8 files changed, 92 insertions, 75 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index a6d07dc..c2996d2 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -66,7 +66,8 @@ set autoindent		    " If current line has indent, automatically set indent for n
 set cindent
 set ttimeout
 set ttimeoutlen=50
-set updatetime=250
+set updatetime=500
+autocmd CursorHold * normal! m'
 
 imap <C-c> <Esc>l
 " Change IM to US when exit to Normal mode
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 211a0d1..14d813b 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -78,7 +78,7 @@ vnoremap <leader>, :terminal<CR>
 map <leader>pp :setlocal paste!<cr>
 
 " Switch CDW to root git directory
-nnoremap <Leader>cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
+nnoremap <Leader>cg :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>
 
@@ -450,17 +450,17 @@ endfunc
 " 下面进行 grep，这样能方便的对相关项目进行搜索
 "----------------------------------------------------------------------
 if executable('rg')
-        noremap <silent><F2> :AsyncRun! -cwd=<root> rg -n --no-heading 
-                                \ --color never -g *.h -g *.c* -g *.py -g *.js -g *.vim 
+        noremap <silent><F2> :AsyncRun! -cwd=<root> rg -n --no-heading
+                                \ --color never -g *.h -g *.c* -g *.py -g *.js -g *.vim
                                 \ <C-R><C-W> "<root>" <cr>
 elseif has('win32') || has('win64')
-        noremap <silent><F2> :AsyncRun! -cwd=<root> findstr /n /s /C:"<C-R><C-W>" 
+        noremap <silent><F2> :AsyncRun! -cwd=<root> findstr /n /s /C:"<C-R><C-W>"
                                 \ "\%CD\%\*.h" "\%CD\%\*.c*" "\%CD\%\*.py" "\%CD\%\*.js"
                                 \ "\%CD\%\*.vim"
                                 \ <cr>
 else
-        noremap <silent><F2> :AsyncRun! -cwd=<root> grep -n -s -R <C-R><C-W> 
-                                \ --include='*.h' --include='*.c*' --include='*.py' 
+        noremap <silent><F2> :AsyncRun! -cwd=<root> grep -n -s -R <C-R><C-W>
+                                \ --include='*.h' --include='*.c*' --include='*.py'
                                 \ --include='*.js' --include='*.vim'
                                 \ '<root>' <cr>
 endif
diff --git a/vim/init/plugins.vim b/vim/init/plugins.vim
index 5b05c8e..d8b1307 100644
--- a/vim/init/plugins.vim
+++ b/vim/init/plugins.vim
@@ -145,7 +145,7 @@ let g:ale_set_quickfix = 1
 "
 "
 ""----------------------------------------------------------------------
-"" 默认插件 
+"" 默认插件
 ""----------------------------------------------------------------------
 "
 "" 全文快速移动，<leader><leader>f{char} 即可触发
@@ -276,7 +276,7 @@ let g:ale_set_quickfix = 1
 "
 "       " 提供 gist 接口
 "       Plug 'lambdalisue/vim-gista', { 'on': 'Gista' }
-"       
+"
 "       " ALT_+/- 用于按分隔符扩大缩小 v 选区
 "       map <m-=> <Plug>(expand_region_expand)
 "       map <m--> <Plug>(expand_region_shrink)
@@ -305,7 +305,7 @@ let g:ale_set_quickfix = 1
 "       let g:gutentags_cache_dir = expand('~/.cache/tags')
 "
 "       " 默认禁用自动生成
-"       let g:gutentags_modules = [] 
+"       let g:gutentags_modules = []
 "
 "       " 如果有 ctags 可执行就允许动态生成 ctags 文件
 "       if executable('ctags')
@@ -382,7 +382,7 @@ let g:ale_set_quickfix = 1
 "       " rust 语法增强
 "       Plug 'rust-lang/rust.vim', { 'for': 'rust' }
 "
-"       " vim org-mode 
+"       " vim org-mode
 "       Plug 'jceb/vim-orgmode', { 'for': 'org' }
 "endif
 "
@@ -469,13 +469,13 @@ let g:ale_set_quickfix = 1
 "
 "       " 编辑不同文件类型需要的语法检查器
 "       let g:ale_linters = {
-"                               \ 'c': ['gcc', 'cppcheck'], 
-"                               \ 'cpp': ['gcc', 'cppcheck'], 
-"                               \ 'python': ['flake8', 'pylint'], 
-"                               \ 'lua': ['luac'], 
+"                               \ 'c': ['gcc', 'cppcheck'],
+"                               \ 'cpp': ['gcc', 'cppcheck'],
+"                               \ 'python': ['flake8', 'pylint'],
+"                               \ 'lua': ['luac'],
 "                               \ 'go': ['go build', 'gofmt'],
 "                               \ 'java': ['javac'],
-"                               \ 'javascript': ['eslint'], 
+"                               \ 'javascript': ['eslint'],
 "                               \ }
 "
 "
@@ -660,16 +660,16 @@ let g:ale_set_quickfix = 1
 ""----------------------------------------------------------------------
 "" Ycm 白名单（非名单内文件不启用 YCM），避免打开个 1MB 的 txt 分析半天
 ""----------------------------------------------------------------------
-"let g:ycm_filetype_whitelist = { 
+"let g:ycm_filetype_whitelist = {
 "                       \ "c":1,
-"                       \ "cpp":1, 
+"                       \ "cpp":1,
 "                       \ "objc":1,
 "                       \ "objcpp":1,
 "                       \ "python":1,
 "                       \ "java":1,
 "                       \ "javascript":1,
 "                       \ "coffee":1,
-"                       \ "vim":1, 
+"                       \ "vim":1,
 "                       \ "go":1,
 "                       \ "cs":1,
 "                       \ "lua":1,
diff --git a/vim/init/style.vim b/vim/init/style.vim
index 8d056b0..a96601a 100644
--- a/vim/init/style.vim
+++ b/vim/init/style.vim
@@ -92,7 +92,7 @@ endif
 hi! SignColumn guibg=NONE ctermbg=NONE
 
 " 修改行号为浅灰色，默认主题的黄色行号很难看，换主题可以仿照修改
-highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE 
+highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE
         \ gui=NONE guifg=DarkGrey guibg=NONE
 
 " 修正补全目录的色彩：默认太难看
@@ -106,7 +106,7 @@ hi! PmenuSel guibg=gray guifg=brown ctermbg=brown ctermfg=gray
 if has('terminal') && exists(':terminal') == 2
         if exists('##TerminalOpen')
                 augroup VimUnixTerminalGroup
-                        au! 
+                        au!
                         au TerminalOpen * setlocal nonumber signcolumn=no
                 augroup END
         endif
@@ -174,7 +174,7 @@ function! Vim_NeatBuffer(bufnr, fullname)
                 if l:name == ''
                         return '[No Name]'
                 else
-                        if a:fullname 
+                        if a:fullname
                                 return fnamemodify(l:name, ':p')
                         else
                                 let aname = fnamemodify(l:name, ':p')
@@ -193,7 +193,7 @@ function! Vim_NeatBuffer(bufnr, fullname)
                 if l:buftype == 'quickfix'
                         return '[Quickfix]'
                 elseif l:name != ''
-                        if a:fullname 
+                        if a:fullname
                                 return '-'.fnamemodify(l:name, ':p')
                         else
                                 return '-'.fnamemodify(l:name, ':t')
diff --git a/vim/lua/configs/conform.lua b/vim/lua/configs/conform.lua
index a000447..3553caf 100644
--- a/vim/lua/configs/conform.lua
+++ b/vim/lua/configs/conform.lua
@@ -1,8 +1,9 @@
 local options = {
   formatters_by_ft = {
     lua = { "stylua" },
-    -- css = { "prettier" },
-    -- html = { "prettier" },
+    css = { "prettier" },
+    html = { "prettier" },
+    markdown = { "prettier" }
   },
 
   -- format_on_save = {
diff --git a/vim/lua/configs/lspconfig.lua b/vim/lua/configs/lspconfig.lua
index a73657a..c0fda79 100644
--- a/vim/lua/configs/lspconfig.lua
+++ b/vim/lua/configs/lspconfig.lua
@@ -1,4 +1,4 @@
--- EXAMPLE 
+-- EXAMPLE
 local on_attach = require("nvchad.configs.lspconfig").on_attach
 local on_init = require("nvchad.configs.lspconfig").on_init
 local capabilities = require("nvchad.configs.lspconfig").capabilities
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 7408708..fd58297 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -2,63 +2,63 @@
 
 -- add yours here
 
-local map = vim.keymap.set
-
-map("i", "jk", "<ESC>")
+vim.keymap.set("i", "jk", "<ESC>")
+vim.keymap.set("n", "<leader>co", "<cmd>cd ~/.config/nvim<CR><cmd>pwd<CR>")
 vim.cmd("command! W execute 'SudaWrite %'")
 
 -- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")
 
-map("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" })
+vim.keymap.set("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" })
 
 -- map("n", "<C-c>", "<cmd>%y+<CR>", { desc = "file copy whole" })
 
 -- map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "toggle line number" })
 -- map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "toggle relative number" })
-map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "toggle nvcheatsheet" })
+vim.keymap.set("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "toggle nvcheatsheet" })
 
-map("n", "<leader>F", function()
+vim.keymap.set("n", "<leader>F", function()
   require("conform").format { lsp_fallback = true }
 end, { desc = "format files" })
 
 -- global lsp mappings
-map("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" })
+vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" })
 
 -- tabufline
-map("n", "<tab>", function()
+vim.keymap.set("n", "<tab>", function()
   require("nvchad.tabufline").next()
 end, { desc = "buffer goto next" })
 
-map("n", "<S-tab>", function()
+vim.keymap.set("n", "<S-tab>", function()
   require("nvchad.tabufline").prev()
 end, { desc = "buffer goto prev" })
 
-map("n", "<leader>x", function()
+vim.keymap.set("n", "<leader>x", function()
   require("nvchad.tabufline").close_buffer()
 end, { desc = "buffer close" })
 
 -- Comment
-map("n", "<leader>/", "gcc", { desc = "comment toggle", remap = true })
-map("v", "<leader>/", "gc", { desc = "comment toggle", remap = true })
+vim.keymap.set("n", "<leader>/", "gcc", { desc = "comment toggle", remap = true })
+vim.keymap.set("v", "<leader>/", "gc", { desc = "comment toggle", remap = true })
 
 -- nvimtree
-map("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "nvimtree toggle window" })
-map("n", "<leader>nf", "<cmd>NvimTreeFocus<CR>", { desc = "nvimtree focus window" })
+vim.keymap.set("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "nvimtree toggle window" })
+vim.keymap.set("n", "<leader>nf", "<cmd>NvimTreeFocus<CR>", { desc = "nvimtree focus window" })
 
 -- telescope
-map("n", "<leader>f", "<cmd>Telescope oldfiles<CR>", { desc = "telescope find oldfiles" })
-map("n", "<leader>b", "<cmd>Telescope buffers<CR>", { desc = "telescope find buffers" })
-map("n", "<leader>/", "<cmd>Telescope current_buffer_fuzzy_find<CR>", { desc = "telescope find in current buffer" })
-map("n", "<leader>sf", "<cmd>Telescope find_files<cr>", { desc = "telescope find files" })
-map("n", "<leader>sF", "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>",
+vim.keymap.set("n", "<leader>f", "<cmd>Telescope oldfiles<CR>", { desc = "telescope find oldfiles" })
+vim.keymap.set("n", "<leader>b", "<cmd>Telescope buffers<CR>", { desc = "telescope find buffers" })
+vim.keymap.set("n", "<leader>/", "<cmd>Telescope current_buffer_fuzzy_find<CR>",
+  { desc = "telescope find in current buffer" })
+vim.keymap.set("n", "<leader>sf", "<cmd>Telescope find_files<cr>", { desc = "telescope find files" })
+vim.keymap.set("n", "<leader>sF", "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>",
   { desc = "telescope find all files" })
-map("n", "<leader>sg", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })
+vim.keymap.set("n", "<leader>sg", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })
 
-map("n", "<leader>gf", "<cmd>Telescope git_files<CR>", { desc = "telescope git files" })
-map("n", "<leader>sH", "<cmd>Telescope help_tags<CR>", { desc = "telescope help page" })
-map("n", "<leader>tt", ":Telescope ", { desc = "telescope help page" })
-map('n', '<leader>sk', "<cmd>Telescope keymaps<CR>", { desc = 'telescope keymaps' })
-map("n", "<leader>pt", "<cmd>Telescope terms<CR>", { desc = "telescope pick hidden term" })
+vim.keymap.set("n", "<leader>gf", "<cmd>Telescope git_files<CR>", { desc = "telescope git files" })
+vim.keymap.set("n", "<leader>sH", "<cmd>Telescope help_tags<CR>", { desc = "telescope help page" })
+vim.keymap.set("n", "<leader>tt", ":Telescope ", { desc = "telescope help page" })
+vim.keymap.set('n', '<leader>sk', "<cmd>Telescope keymaps<CR>", { desc = 'telescope keymaps' })
+vim.keymap.set("n", "<leader>pt", "<cmd>Telescope terms<CR>", { desc = "telescope pick hidden term" })
 
 vim.keymap.set('n', '<leader>ss', function()
   local current_filetype = vim.bo.filetype
@@ -82,6 +82,26 @@ vim.keymap.set('n', '<leader>ss', function()
   }
 end, { desc = '[S]earch [S]nippets' })
 
+vim.keymap.set('n', '<leader>sd', function()
+  require('telescope.builtin').oldfiles {
+    prompt_title = 'CD to',
+    attach_mappings = function(prompt_bufnr, map)
+      local cd_to_dir = function()
+        local file = require('telescope.actions.state').get_selected_entry()[1]
+        local path = string.match(file, "(.*[/\\])")
+        require('telescope.actions').close(prompt_bufnr)
+        vim.cmd("cd " .. path)
+        vim.cmd("pwd")
+      end
+
+      map('i', '<CR>', cd_to_dir)
+      map('n', '<CR>', cd_to_dir)
+
+      return true
+    end,
+  }
+end, { desc = 'Search Directory' })
+
 vim.keymap.set('n', '<leader>sn', function()
   vim.ui.input({ prompt = 'Snippet Name: ' }, function(snippet_path)
     local current_filetype
@@ -112,27 +132,27 @@ end, { desc = "Create a new snippet" })
 -- map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
 
 -- new terminals
-map("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end,
+vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end,
   { desc = "terminal new horizontal term" })
-map("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end,
+vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end,
   { desc = "terminal new vertical window" })
 -- toggleable
-map({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end,
+vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end,
   { desc = "terminal toggleable vertical term" })
-map({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end,
+vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end,
   { desc = "terminal new horizontal term" })
-map({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end,
+vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end,
   { desc = "terminal toggle floating term" })
 
 -- whichkey
-map("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
+vim.keymap.set("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
 
-map("n", "<leader>wk", function()
+vim.keymap.set("n", "<leader>wk", function()
   vim.cmd("WhichKey " .. vim.fn.input "WhichKey: ")
 end, { desc = "whichkey query lookup" })
 
 -- blankline
-map("n", "<leader>cc", function()
+vim.keymap.set("n", "<leader>cc", function()
   local config = { scope = {} }
   config.scope.exclude = { language = {}, node_type = {} }
   config.scope.include = { node_type = {} }
@@ -148,11 +168,12 @@ map("n", "<leader>cc", function()
 end, { desc = "blankline jump to current context" })
 
 -- [[ Configure Obsidian.nvim ]]
-map('n', "<leader>oo", ':Obsidian')
-map('n', "<leader>ot", ':ObsidianTags<CR>')
-map('n', "<leader>os", ':ObsidianSearch<CR>')
-map('n', "<leader>oq", ':ObsidianQuickSwitch<CR>')
-map('v', "<leader>on", ':ObsidianLinkNew<CR>')
+vim.keymap.set('n', "<leader>oo", ':Obsidian')
+vim.keymap.set('n', "<leader>ot", ':ObsidianTags<CR>')
+vim.keymap.set('n', "<leader>os", ':ObsidianSearch<CR>')
+vim.keymap.set('n', "<leader>oq", ':ObsidianQuickSwitch<CR>')
+vim.keymap.set('v', "<leader>on", ':ObsidianLinkNew<CR>')
+vim.keymap.set('n', "<leader>ol", ':ObsidianLinks<CR>')
 
 -- vim.cmd("let g:mkdp_browser = 'surf'")
 vim.cmd("let g:mkdp_browser = 'firefox'")
@@ -170,7 +191,7 @@ 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", "{", "<cmd>AerialPrev<CR>", {})
+vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", {})
 vim.keymap.set("n", "<leader><leader>a", "<cmd>Telescope aerial<CR>")
-vim.keymap.set("n", "<leader><leader>A", "<cmd>AerialToggle!left<CR>")
+vim.keymap.set("n", "<leader><leader>A", function() require("aerial").toggle({ direction = "left" }) end)
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index f6fb013..2342d18 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -40,7 +40,7 @@ return {
     -- Add indentation guides even on blank lines
     'lukas-reineke/indent-blankline.nvim',
     -- See `:help ibl`
-    enabled = false,
+    enabled = true,
     main = "ibl",
     opts = {
       indent = { char = "┊" },
@@ -173,13 +173,6 @@ return {
   {
     'stevearc/aerial.nvim',
     opts = {
-      on_attach = function(bufnr)
-        -- Jump forwards/backwards with '{' and '}'
-        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>")
-      end,
     },
     -- Optional dependencies
     dependencies = {
@@ -213,6 +206,7 @@ return {
   {
     "williamboman/mason.nvim",
     opts = {
+      automatically_installation = true,
       ensure_installed = {
         "lua-language-server", "stylua",
         "html-lsp", "css-lsp", "prettier"