7 files changed, 33 insertions, 26 deletions

diff --git a/alias b/alias
index 3aeb84f..8d3f192 100644
--- a/alias
+++ b/alias
@@ -134,6 +134,7 @@ alias k='kill %1'
 alias s='sudo systemctl'
 alias j='sudo journalctl -xeu'
 alias m='mutt'
+alias h='himalaya'
 alias gmail="mutt -F $SETTING_DIR/mutt/muttrc.gmail"
 alias ntu="mutt -F $SETTING_DIR/mutt/muttrc.b97602041"
 path() { echo $PATH; } # Should not use alias, because $PATH is not initialized
diff --git a/bin/gpt/shellrc b/bin/gpt/shellrc
index eeeec5d..d7fcb61 100644
--- a/bin/gpt/shellrc
+++ b/bin/gpt/shellrc
@@ -4,7 +4,7 @@ gptt() {
   vim $file && cat $file | gpt --skip
 }
 # Ask GPT what's wrong with the last command
-h() {
+gpth() {
   printf '%s\n\n%s' "$(fc -s 2>&1 >/dev/null)" "Tell me what's wrong with the command above" | \
   gpt --skip
 }
diff --git a/vim/after/syntax/basic.vim b/vim/after/syntax/basic.vim
new file mode 100644
index 0000000..db3d6b4
--- /dev/null
+++ b/vim/after/syntax/basic.vim
@@ -0,0 +1,2 @@
+hi CursorLine guibg=NONE
+hi CursorLineNr term=bold cterm=bold ctermfg=226 gui=bold guifg=#eeee00
diff --git a/vim/init.vim b/vim/init.vim
index ef303c3..ad434c4 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -28,5 +28,3 @@ else
   LoadScript init/plugins.vim
   LoadScript init/style.vim
 endif
-
-highlight CursorLineNr term=bold cterm=bold ctermfg=226 gui=bold guifg=#eeee00
diff --git a/vim/init/config.vim b/vim/init/config.vim
index 281caf5..8c75de9 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -24,6 +24,7 @@ augroup TerminalSize
     endif
   endfunc
   autocmd VimEnter,VimResized * silent call LayoutForSmallTerminal(20)
+  autocmd VimLeave * if g:alacritty_extra_padding | call ToggleWinPadding() | endif
 augroup END
 
 " }}}
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 01726b9..a28ce09 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -475,14 +475,13 @@ function! CloseBufferSafely()
   " Ask Saving
   if &modified
     let answer = confirm("Save changes?", "&Yes\n&No\n&Cancel")
-    if answer == 1 | write | endif
-    if answer == 2 && empty(bufname()) | bd! | return | endif
+    if answer == 1 | call s:WriteOrEnterFileName() | endif
     if answer == 3 | return | endif
     if answer == "" | return | endif
   endif
 
   let bufnr = bufnr()
-  if len(t:bufs) == 1
+  if !has_key(t:, 'bufs') || len(t:bufs) == 1
     " Close tab for last buffer
     tabclose
   else
@@ -491,11 +490,14 @@ function! CloseBufferSafely()
     exe "b "..next_buf
     call filter(t:bufs, 'v:val != '..bufnr)
   endif
+
+  " Remove unnamed buffer
+  if empty(bufname(bufnr)) | silent! exe 'bd! '.bufnr | endif
 endfunction
 function! Bye()
   let windows = gettabinfo(tabpagenr())[0]['windows']
 
-  if len(t:bufs) <= 1 && len(windows) == 1
+  if len(gettabinfo()) == 1 && len(t:bufs) <= 1 && len(windows) == 1
     call QuitWithCheck()
   elseif &diff
     silent call CloseBuffersForDiff()
@@ -630,12 +632,13 @@ function! ToggleWinPadding()
   else
     redir => output | hi LineNr | redir END
     let bg_color = matchstr(output, 'guibg=\zs[^\s]\+\ze')
+    if empty(bg_color) | let bg_color = "#14161b" | endif
 
     try
       exe "hi EndOfBuffer guifg="..bg_color.." guibg="..bg_color
       exe "hi MsgArea guibg="..bg_color
     endtry
-    exe "!alacritty msg config --window-id $WINDOWID window.padding.x=300 'colors.primary.background=\"\\"..bg_color.."\"'"
+    exe "!alacritty msg config --window-id $WINDOWID window.padding.x=270 'colors.primary.background=\"\\"..bg_color.."\"'"
   endif
 
   let g:alacritty_extra_padding = !g:alacritty_extra_padding
@@ -706,7 +709,7 @@ nnoremap <leader>cp :cp<CR>
 nnoremap <leader>cw :cw 10<CR>
 
 " }}}
-" REDIRECTION_WITH_BUFFER {{{
+" REDIRECTION {{{
 
 " Usage:
 "       :Redir hi ............. show the full output of command ':hi' in a scratch window
diff --git a/vim/mini.lua b/vim/mini.lua
index 398ebb4..ff1a3fe 100644
--- a/vim/mini.lua
+++ b/vim/mini.lua
@@ -152,9 +152,7 @@ end, { buffer = bufnr, desc = "Toggle diff" })
 -- }}}
 -- mini.map {{{
 require("mini.map").setup()
-vim.keymap.set("n", "\\m", function()
-  require("mini.map").toggle()
-end, { desc = "Minimap", buffer = bufnr })
+vim.keymap.set("n", "\\M", function() require("mini.map").toggle() end, { desc = "Minimap", buffer = bufnr })
 -- }}}
 -- mini.visits {{{
 
@@ -971,20 +969,24 @@ require("lazy").setup({
     end,
   },
 -- }}}
-  -- -- markview.nvim {{{
-  -- {
-  --   "OXY2DEV/markview.nvim",
-  --   enable = false,
-  --   ft = "markdown",
-  --
-  --   dependencies = {
-  --     -- You may not need this if you don't lazy load
-  --     -- Or if the parsers are in your $RUNTIMEPATH
-  --     "nvim-treesitter/nvim-treesitter",
-  --
-  --     "nvim-tree/nvim-web-devicons"
-  --   },
-  -- },-- }}}
+  -- markview.nvim {{{
+  {
+    "OXY2DEV/markview.nvim",
+    lazy = false,
+    ft = "markdown",
+
+    dependencies = {
+      -- You may not need this if you don't lazy load
+      -- Or if the parsers are in your $RUNTIMEPATH
+      "nvim-treesitter/nvim-treesitter",
+
+      "nvim-tree/nvim-web-devicons"
+    },
+    config = function()
+      vim.keymap.set( 'n', '\\m', ":Markview<CR>", { buffer = bufnr, desc = '' })
+    end
+  },
+  -- }}}
 
   -- lspconfig {{{
   -- Use :help lspconfig-all to check servers