5 files changed, 16 insertions, 10 deletions

diff --git a/vim/init.vim b/vim/init.vim
index 9145855..7c481b8 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -29,6 +29,9 @@ source ~/helper/vim/init/keymaps.vim
 " Extra config for different contexts
 source ~/helper/vim/init/config.vim
 
+" Highlight
+source ~/helper/vim/init/special_highlight.vim
+
 if has('nvim')
   " For neovim
   source ~/.config/nvim/lazy.lua
@@ -37,5 +40,3 @@ else
   source ~/helper/vim/init/plugins.vim
   source ~/helper/vim/init/style.vim
 endif
-
-source ~/helper/vim/init/special_highlight.vim
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index aff5428..5441f32 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -269,8 +269,10 @@ noremap <leader><leader>ft :set filetype=
 noremap <leader><leader>fm :set foldmethod=
 
 " Let <leader>l toggle between this and the last accessed buffer
+augroup SaveLastBuffer
 let g:lastbuffer = 1
 au BufLeave * let g:lastbuffer = bufnr()
+augroup END
 
 
 "----------------------------------------------------------------------
diff --git a/vim/init/special_highlight.vim b/vim/init/special_highlight.vim
index 50e4dc3..9729183 100644
--- a/vim/init/special_highlight.vim
+++ b/vim/init/special_highlight.vim
@@ -12,7 +12,7 @@ endfunction
 
 " Defualt highlight for matched parenthesis is so weird in many colorscheme
 " Why the background color is lighter than my caret !?
-highlight MatchParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
+" highlight MatchParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
 highlight LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
 
 " Show trailing spaces
@@ -23,6 +23,6 @@ match ExtraWhitespace /\s\+$/
 " define line highlight color
 highlight MultiLineHighlight ctermbg=LightYellow guibg=LightYellow ctermfg=Black guifg=Black
 " highlight the current line
-nnoremap <silent> <leader><leader>h :call matchadd('MultiLineHighlight', '\%'.line('.').'l')<CR>
+nnoremap <silent> <leader>gh :call matchadd('MultiLineHighlight', '\%'.line('.').'l')<CR>
 " clear all the highlighted lines
-nnoremap <silent> <leader><leader>H :call clearmatches()<CR>
+nnoremap <silent> <leader>gH :call clearmatches()<CR>
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index e9a20f5..4ae28c1 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -97,16 +97,15 @@ 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 cd_prompt = 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")
+        vim.api.nvim_feedkeys(":cd " .. path, 'n', true)
       end
 
-      map('i', '<CR>', cd_to_dir)
-      map('n', '<CR>', cd_to_dir)
+      map('i', '<CR>', cd_prompt)
+      map('n', '<CR>', cd_prompt)
 
       return true
     end,
@@ -184,3 +183,6 @@ vim.cmd('vmap s S')
 -- [ Aerial ]"" "<cmd>AerialNext<CR>", {})
 vim.keymap.set("n", "gL", "<cmd>Telescope aerial<CR>")
 vim.keymap.set("n", "gl", function() require("aerial").toggle({ direction = "left" }) end)
+
+--[ TrunZen ]
+vim.keymap.set('n', '<leader>z', ':TZAtaraxis<CR>')
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index 8c7a049..adcff9b 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -12,6 +12,7 @@ return {
   -- For focus mode
   {
     "Pocco81/true-zen.nvim",
+    lazy = false,
     cmd = { "TZAtaraxis", "TZMinimalist" },
   },