From 0167eb5aa5811fc13a107a1aa5b4ea3452a66e60 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Tue, 17 Sep 2024 11:37:32 +0800
Subject: Update

---
 X11/openbox/rc.xml     |  3 ++-
 alias                  |  5 +++--
 misc/tmux.conf         | 17 ++++++++++++-----
 vim/init.vim           |  2 +-
 vim/init/basic.vim     | 11 +++++++++--
 vim/init/highlight.vim |  4 +++-
 vim/init/keymaps.vim   | 10 ++++++----
 vim/mini.lua           |  9 ++++++++-
 8 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/X11/openbox/rc.xml b/X11/openbox/rc.xml
index 4b13081..652c003 100644
--- a/X11/openbox/rc.xml
+++ b/X11/openbox/rc.xml
@@ -111,7 +111,8 @@
             alacritty --title @OPENBOX_CONFIG \
             -o "window.dimensions.lines=32" \
             -o "window.dimensions.columns=70" \
-            -e nvim ~/.config/openbox/rc.xml \
+            -e nvim ~/.config/openbox/rc.xml;
+            openbox --reconfigure
           '
         </command>
       </action>
diff --git a/alias b/alias
index 1d9ff8d..e40ef38 100644
--- a/alias
+++ b/alias
@@ -56,7 +56,7 @@ alias vr='vim -R'
 # Edit last file
 alias vl="vim -c 'norm '"
 # Use Telescope to select recent files
-vll() { nvim -c 'Telescope oldfiles'; }
+vll() { vim -c 'Telescope oldfiles'; }
 # Apply defaut session
 alias vS="vim -S /tmp/vim.session"
 alias cdv='cd ~/.config/nvim'
@@ -199,6 +199,7 @@ file.size() {
 }
 highlight() { grep --color -E "$1|\$"; }
 alias iso8601='date --iso-8601=minutes'
+# Make file undeletable
 alias lock='sudo chattr +i'
 # Reset clock
 date.reset() {
@@ -561,6 +562,6 @@ vvv() {
     if [ $? -ne 0 ]; then
       break
     fi
-    echo "restarting nvim...";
+    echo "restarting vim...";
   done
 }
diff --git a/misc/tmux.conf b/misc/tmux.conf
index 0806bbf..70c3188 100644
--- a/misc/tmux.conf
+++ b/misc/tmux.conf
@@ -1,21 +1,28 @@
 set -g default-terminal "tmux-256color"
 set -ag terminal-overrides ",xterm-256color:RGB"
+set -sg escape-time 0
 
+# Use Ctrl-G for prefix
 unbind C-b
 set-option -g prefix C-g
 bind-key C-g send-prefix
+
 set-option -gw xterm-keys on
+
+# Tab key
 bind-key -nr C-_ send-keys C-/
 
 new-session                       # Start a new session if none available
+
 bind N new-session
 bind-key -n C-F3 set-option -g status #Ctrl+F3 Combo
 
 bind k copy-mode
+bind-key T swap-window -t 0
 
-set -sg escape-time 0
+bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
 
-#bind C-q select-layout even-horizontal
-#bind C-w select-layout even-vertical
-#bind C-e select-layout main-horizontal
-#bind C-r select-layout main-vertical
+bind C-q select-layout even-horizontal
+bind C-w select-layout even-vertical
+bind C-e select-layout main-horizontal
+bind C-r select-layout main-vertical
diff --git a/vim/init.vim b/vim/init.vim
index 59be77e..7e33b6a 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -31,4 +31,4 @@ endif
 
 LoadScript init/highlight.vim
 
-source ~/.projects.vim
+silent source ~/.projects.vim
diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 37e0abf..79ed3fd 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -101,7 +101,10 @@ set matchtime=2
 set statusline=\ %F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c
 set laststatus=2            " Always show the status line
 set ruler                    " Show cursor position
-set wildmenu wildoptions=pum,fuzzy
+set wildmenu
+if has('nvim')
+  set wildoptions=pum,fuzzy
+endif
 
 " Format of error message
 set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
@@ -110,7 +113,11 @@ set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
 set splitright
 
 " Set signcolumn
-set signcolumn=yes:3
+if has('nvim')
+  set signcolumn=yes:3
+else
+  set signcolumn=3
+endif
 " Custom sign from help page :h sign
 sign define piet text=>> texthl=Search
 
diff --git a/vim/init/highlight.vim b/vim/init/highlight.vim
index 22fe5a3..01f74b8 100644
--- a/vim/init/highlight.vim
+++ b/vim/init/highlight.vim
@@ -2,7 +2,9 @@
 hi LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
 
 " Show trailing spaces
-match ExtraWhitespace /\s\+$/
+if has('nvim')
+  match ExtraWhitespace /\s\+$/
+endif
 hi ExtraWhitespace ctermbg=red guibg=red
 
 hi CursorLine guibg=NONE
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index bf3d7ab..2d58fe9 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -46,10 +46,12 @@ nnoremap q: :
 " WORKING_DIR {{{
 
 let g:last_path = execute("pwd")
-augroup SaveLatestDir
-  au!
-  autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0]
-augroup END
+if has('nvim')
+  augroup SaveLatestDir
+    au!
+    autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0]
+  augroup END
+endif
 
 " Switch CWD to the directory of the open buffer
 nnoremap cd :cd %:p:h<CR>:pwd<CR>
diff --git a/vim/mini.lua b/vim/mini.lua
index 0658d4d..177d80a 100644
--- a/vim/mini.lua
+++ b/vim/mini.lua
@@ -642,7 +642,14 @@ require("lazy").setup({
       vim.keymap.set(
         "n",
         "<leader>sF",
-        "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>",
+        function()
+          require("telescope.builtin").find_files({
+              follow = ture,
+              no_ignore = true,
+              hidden = true,
+              file_ignore_patterns = {},
+          })
+        end,
         { desc = "telescope find all files" }
       )
       vim.keymap.set("n", "<leader>sg", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })
-- 
cgit v1.2.3-70-g09d2