5 files changed, 27 insertions, 23 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index c2996d2..5008b2f 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -170,7 +170,10 @@ autocmd BufRead /dev/shm/*.txt call SetPasswordFile()
 function SetPasswordFile()
     setlocal foldminlines=0
     setlocal foldmethod=manual
-    setlocal foldtext=
+    function s:custom()
+      return "Password"
+    endfunction
+    setlocal foldtext=s:custom()
     norm! ggzfl
 endfunction
 
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index f789ceb..245905a 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -129,7 +129,7 @@ vnoremap so :source<CR>
 " MANAGE_VIMRC
 "----------------------------------------------------------------------
 nnoremap <leader>e :edit $MYVIMRC<CR>
-autocmd! bufwritepost $MYVIMRC source $MYVIMRC
+autocmd! BUFWRITEPOST $MYVIMRC source $MYVIMRC
 
 
 "----------------------------------------------------------------------
@@ -245,18 +245,19 @@ endfunc
 "----------------------------------------------------------------------
 
 " Open a new buffer
+nmap <leader><leader>b :enew<CR>
 nmap <leader>O :e /tmp/buffer<CR>
 
 " Next buffer
-noremap <leader>l :bn<CR>
+noremap <leader>l :exe "buffer ".g:lastbuffer<CR>
+" noremap <Tab> :exe 'buffer '.g:lastbuffer<CR>
 
 " set filetype
 noremap <leader><leader>ft :set filetype=
-noremap <leader><leader>fm :set foldmethod=
+noremap <leader><leader>f  :set foldmetho =
 
 " Let <leader>l toggle between this and the last accessed buffer
 let g:lastbuffer = 1
-noremap <Tab> :exe "buffer ".g:lastbuffer<CR>
 au BufLeave * let g:lastbuffer = bufnr()
 
 "----------------------------------------------------------------------
@@ -270,7 +271,7 @@ vnoremap [ <ESC>`<i[<ESC>`>la]<ESC>
 vnoremap { <ESC>`<i{<ESC>`>la}<ESC>
 vnoremap ` <ESC>`<i`<ESC>`>la`<ESC>
 vnoremap <space> <ESC>`<i<space><ESC>`>la<space><ESC>
-vnoremap z <ESC>`<i「<ESC>`>la」<ESC>
+vnoremap Q <ESC>`<i「<ESC>`>la」<ESC>
 
 
 "----------------------------------------------------------------------
diff --git a/vim/lua/chadrc.lua b/vim/lua/chadrc.lua
index aa0d78c..aa9a78c 100644
--- a/vim/lua/chadrc.lua
+++ b/vim/lua/chadrc.lua
@@ -41,6 +41,8 @@ if M.ui.tabufline.enabled then
   vim.keymap.set("n", "<A-l>", function() require("nvchad.tabufline").move_buf(1) end)
   vim.keymap.set("n", "<A-H>", function() vim.cmd("tabprevious") end)
   vim.keymap.set("n", "<A-L>", function() vim.cmd("tabnext") end)
+  vim.keymap.set("n", "<tab>", function() require("nvchad.tabufline").next() end, { desc = "buffer goto next" })
+  vim.keymap.set("n", "<S-tab>", function() require("nvchad.tabufline").prev() end, { desc = "buffer goto prev" })
 end
 
 
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 45c44ec..9151f17 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -23,11 +23,6 @@ end, { desc = "format files" })
 -- global lsp mappings
 vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" })
 
--- tabufline
-vim.keymap.set("n", "<leader>x", function()
-  require("nvchad.tabufline").close_buffer()
-end, { desc = "buffer close" })
-
 -- Comment
 vim.keymap.set("n", "<leader>/", "gcc", { desc = "comment toggle", remap = true })
 vim.keymap.set("v", "<leader>/", "gc", { desc = "comment toggle", remap = true })
@@ -66,8 +61,14 @@ vim.keymap.set('n', '<leader>ss', function()
         require('telescope.actions').close(prompt_bufnr)
         vim.api.nvim_put(snippet_content, '', false, true)
       end
+      local edit_selected_snippet = function()
+        local file = require('telescope.actions.state').get_selected_entry()[1]
+        require('telescope.actions').close(prompt_bufnr)
+        vim.cmd(":e " .. cwd .. "/" .. file)
+      end
 
       map('i', '<CR>', insert_selected_snippet)
+      map('i', '<C-T>', edit_selected_snippet)
       map('n', '<CR>', insert_selected_snippet)
 
       return true
@@ -115,17 +116,12 @@ end, { desc = "Create a new snippet" })
 -- map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
 
 -- new terminals
-vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end,
-  { desc = "terminal new horizontal term" })
-vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end,
-  { desc = "terminal new vertical window" })
+vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end, { desc = "terminal new horizontal term" })
+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({ "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", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end, { 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" })
 
 -- whichkey
 vim.keymap.set("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
@@ -176,5 +172,5 @@ vim.keymap.set('n', '<C-.>', ':HopChar1<CR>')
 -- [ Aerial ]
 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", function() require("aerial").toggle({ direction = "left" }) end)
+vim.keymap.set("n", "gN", "<cmd>Telescope aerial<CR>")
+vim.keymap.set("n", "gn", function() require("aerial").toggle({ direction = "left" }) end)
diff --git a/vim/lua/options.lua b/vim/lua/options.lua
index c16ae64..1c2b881 100644
--- a/vim/lua/options.lua
+++ b/vim/lua/options.lua
@@ -4,6 +4,8 @@ require "nvchad.options"
 
 local o = vim.o
 
+o.clipboard = ''
+
 -- To enable cursorline!
 o.cursorlineopt ='both'