diff options
| author | Hsieh Chin Fan <pham@topo.tw> | 2024-06-26 21:29:34 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <pham@topo.tw> | 2024-06-26 21:29:34 +0800 |
| commit | e58f70b411ae935fcd32f00d9e3983381fdc0294 (patch) | |
| tree | 5672bd85da49640e599d4f340c609d74cbd5e990 /vim | |
| parent | 44f31b1f27c2a53cf8a4e053a50c245e379558b0 (diff) | |
Update
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/init/config.vim | 23 | ||||
| -rw-r--r-- | vim/init/keymaps.vim | 3 | ||||
| -rw-r--r-- | vim/lazy.lua | 2 | ||||
| -rw-r--r-- | vim/lua/mappings.lua | 7 | ||||
| -rw-r--r-- | vim/lua/plugins/init.lua | 5 |
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 @@ | |||
| 10 | " Open help page in a new tab | 10 | " Open help page in a new tab |
| 11 | autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif | 11 | autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif |
| 12 | 12 | ||
| 13 | " Quickly edit html tag class | ||
| 14 | function! s:ChangeAttr(pattern) | ||
| 15 | |||
| 16 | let l:attr = matchstr(getline('.'), a:pattern.'="') | ||
| 17 | if l:attr == '' | ||
| 18 | let l:all_attrs = matchstr(getline('.'), '<[[:alnum:]]\+\zs\s\?[^>]*>\ze') | ||
| 19 | execute 's/'.l:all_attrs.'/ '.a:pattern.'=""'.l:all_attrs.'/' | ||
| 20 | noh | ||
| 21 | normal! 0f"l | ||
| 22 | startinsert | ||
| 23 | else | ||
| 24 | normal! 0 | ||
| 25 | call search(l:attr) | ||
| 26 | normal! f"l | ||
| 27 | noh | ||
| 28 | startinsert | ||
| 29 | endif | ||
| 30 | endfunction | ||
| 31 | |||
| 32 | autocmd FileType html nnoremap <leader>cl :call <SID>ChangeAttr("class")<CR> | ||
| 33 | autocmd BufLeave nunmap <leader>cl | ||
| 34 | autocmd FileType html nnoremap <leader>id :call <SID>ChangeAttr("id")<CR> | ||
| 35 | autocmd BufLeave nunmap <leader>id | ||
| 13 | 36 | ||
| 14 | "---------------------------------------------------------------------- | 37 | "---------------------------------------------------------------------- |
| 15 | " 有 tmux 何没有的功能键超时(毫秒) | 38 | " 有 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 | |||
| 246 | 246 | ||
| 247 | " Open a new buffer | 247 | " Open a new buffer |
| 248 | nmap <leader><leader>b :enew<CR> | 248 | nmap <leader><leader>b :enew<CR> |
| 249 | nmap <leader>B :enew<CR> | ||
| 249 | nmap <leader>O :e /tmp/buffer<CR> | 250 | nmap <leader>O :e /tmp/buffer<CR> |
| 250 | 251 | ||
| 251 | " Next buffer | 252 | " Next buffer |
| @@ -254,7 +255,7 @@ noremap <leader>l :exe "buffer ".g:lastbuffer<CR> | |||
| 254 | 255 | ||
| 255 | " set filetype | 256 | " set filetype |
| 256 | noremap <leader><leader>ft :set filetype= | 257 | noremap <leader><leader>ft :set filetype= |
| 257 | noremap <leader><leader>f :set foldmetho = | 258 | noremap <leader><leader>fm :set foldmethod= |
| 258 | 259 | ||
| 259 | " Let <leader>l toggle between this and the last accessed buffer | 260 | " Let <leader>l toggle between this and the last accessed buffer |
| 260 | let g:lastbuffer = 1 | 261 | 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 @@ | |||
| 1 | vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" | ||
| 2 | vim.g.mapleader = "," | 1 | vim.g.mapleader = "," |
| 2 | vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" | ||
| 3 | 3 | ||
| 4 | -- bootstrap lazy and all plugins | 4 | -- bootstrap lazy and all plugins |
| 5 | local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" | 5 | 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" }) | |||
| 110 | -- map("n", "<leader>ma", "<cmd>Telescope marks<CR>", { desc = "telescope find marks" }) | 110 | -- map("n", "<leader>ma", "<cmd>Telescope marks<CR>", { desc = "telescope find marks" }) |
| 111 | -- map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "telescope git commits" }) | 111 | -- map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "telescope git commits" }) |
| 112 | -- map("n", "<leader>gt", "<cmd>Telescope git_status<CR>", { desc = "telescope git status" }) | 112 | -- map("n", "<leader>gt", "<cmd>Telescope git_status<CR>", { desc = "telescope git status" }) |
| 113 | -- map("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" }) | ||
| 114 | 113 | ||
| 115 | -- terminal | 114 | -- terminal |
| 116 | -- map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" }) | 115 | -- 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 { | |||
| 120 | vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end, { desc = "terminal new vertical window" }) | 119 | vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end, { desc = "terminal new vertical window" }) |
| 121 | -- toggleable | 120 | -- toggleable |
| 122 | vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end, { desc = "terminal toggleable vertical term" }) | 121 | vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end, { desc = "terminal toggleable vertical term" }) |
| 122 | vim.keymap.set("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" }) | ||
| 123 | vim.keymap.set({ "t" }, "<A-e>", "<C-\\><C-N><C-W>|<C-W>_i", { desc = "terminal toggleable vertical term" }) | ||
| 123 | vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end, { desc = "terminal new horizontal term" }) | 124 | vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end, { desc = "terminal new horizontal term" }) |
| 124 | vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end, { desc = "terminal toggle floating term" }) | 125 | vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end, { desc = "terminal toggle floating term" }) |
| 126 | vim.keymap.set("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" }) | ||
| 125 | 127 | ||
| 126 | -- whichkey | 128 | -- whichkey |
| 127 | vim.keymap.set("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" }) | 129 | vim.keymap.set("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" }) |
| @@ -169,6 +171,9 @@ vim.g.mkdp_preview_options = { | |||
| 169 | vim.keymap.set('n', "<space>", ':HopWord<CR>') | 171 | vim.keymap.set('n', "<space>", ':HopWord<CR>') |
| 170 | vim.keymap.set('n', '<C-.>', ':HopChar1<CR>') | 172 | vim.keymap.set('n', '<C-.>', ':HopChar1<CR>') |
| 171 | 173 | ||
| 174 | -- [ Configure vim-surround ] | ||
| 175 | vim.cmd('vmap s S') | ||
| 176 | |||
| 172 | -- [ Aerial ] | 177 | -- [ Aerial ] |
| 173 | vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", {}) | 178 | vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", {}) |
| 174 | vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", {}) | 179 | 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 { | |||
| 233 | }, | 233 | }, |
| 234 | }, | 234 | }, |
| 235 | 235 | ||
| 236 | { | ||
| 237 | 'tpope/vim-surround', | ||
| 238 | lazy = false, | ||
| 239 | } | ||
| 240 | |||
| 236 | 241 | ||
| 237 | -- { | 242 | -- { |
| 238 | -- 'akinsho/bufferline.nvim', | 243 | -- 'akinsho/bufferline.nvim', |