5 files changed, 37 insertions, 3 deletions

diff --git a/vim/init/config.vim b/vim/init/config.vim
index 07bed12..489521f 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -10,6 +10,29 @@
 " Open help page in a new tab
 autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif
 
+" Quickly edit html tag class
+function! s:ChangeAttr(pattern)
+
+    let l:attr = matchstr(getline('.'), a:pattern.'="')
+    if l:attr == ''
+      let l:all_attrs = matchstr(getline('.'), '<[[:alnum:]]\+\zs\s\?[^>]*>\ze')
+      execute 's/'.l:all_attrs.'/ '.a:pattern.'=""'.l:all_attrs.'/'
+      noh
+      normal! 0f"l
+      startinsert
+    else
+      normal! 0
+      call search(l:attr)
+      normal! f"l
+      noh
+      startinsert
+    endif
+endfunction
+
+autocmd FileType html nnoremap <leader>cl :call <SID>ChangeAttr("class")<CR>
+autocmd BufLeave nunmap <leader>cl
+autocmd FileType html nnoremap <leader>id :call <SID>ChangeAttr("id")<CR>
+autocmd BufLeave nunmap <leader>id
 
 "----------------------------------------------------------------------
 " 有 tmux 何没有的功能键超时（毫秒）
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 245905a..ff4821e 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -246,6 +246,7 @@ endfunc
 
 " Open a new buffer
 nmap <leader><leader>b :enew<CR>
+nmap <leader>B :enew<CR>
 nmap <leader>O :e /tmp/buffer<CR>
 
 " Next buffer
@@ -254,7 +255,7 @@ noremap <leader>l :exe "buffer ".g:lastbuffer<CR>
 
 " set filetype
 noremap <leader><leader>ft :set filetype=
-noremap <leader><leader>f  :set foldmetho =
+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/lazy.lua b/vim/lazy.lua
index 6cfadf0..ebe7766 100644
--- a/vim/lazy.lua
+++ b/vim/lazy.lua
@@ -1,5 +1,5 @@
-vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/"
 vim.g.mapleader = ","
+vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/"
 
 -- bootstrap lazy and all plugins
 local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 9151f17..eaa6e68 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -110,7 +110,6 @@ end, { desc = "Create a new snippet" })
 -- map("n", "<leader>ma", "<cmd>Telescope marks<CR>", { desc = "telescope find marks" })
 -- map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "telescope git commits" })
 -- map("n", "<leader>gt", "<cmd>Telescope git_status<CR>", { desc = "telescope git status" })
--- map("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" })
 
 -- terminal
 -- map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
@@ -120,8 +119,11 @@ vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new {
 vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end, { desc = "terminal new vertical window" })
 -- toggleable
 vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end, { desc = "terminal toggleable vertical term" })
+vim.keymap.set("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
+vim.keymap.set({ "t" }, "<A-e>", "<C-\\><C-N><C-W>|<C-W>_i", { desc = "terminal toggleable vertical term" })
 vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end, { desc = "terminal new horizontal term" })
 vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end, { desc = "terminal toggle floating term" })
+vim.keymap.set("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" })
 
 -- whichkey
 vim.keymap.set("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
@@ -169,6 +171,9 @@ vim.g.mkdp_preview_options = {
 vim.keymap.set('n', "<space>", ':HopWord<CR>')
 vim.keymap.set('n', '<C-.>', ':HopChar1<CR>')
 
+-- [ Configure vim-surround ]
+vim.cmd('vmap s S')
+
 -- [ Aerial ]
 vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", {})
 vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", {})
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index 8c49369..f54e21d 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -233,6 +233,11 @@ return {
     },
   },
 
+  {
+    'tpope/vim-surround',
+    lazy = false,
+  }
+
 
   -- {
   --   'akinsho/bufferline.nvim',