8 files changed, 34 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index e8c87a8..ba4f2b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 .ONESHELL:
 .PHONY: *
 
+help:
+        @echo Use make all for git tig vim settings
+
 all: git tig vim gpg
         mkdir -p ~/git
 
diff --git a/bin/install.sh b/bin/install.sh
index cfc13d3..94f23e5 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -7,24 +7,36 @@ SETTING_DIR=${SETTING_DIR:-~/helper}
 REPO=${REPO:-typebrook/helper}
 REMOTE=${REMOTE:-https://github.com/${REPO}.git}
 BRANCH=${BRANCH:-dev}
-RCFILE=${RCFILE:-~/.$(basename $SHELL)rc}
+COMMENT_IN_RCFILE="# $REPO: source custom shell settings"
+PROFILE=profile.sh
 
+case "$(basename $SHELL)" in
+  bash) RCFILE=~/.bashrc
+  ;;
+  zsh) RCFILE=~/.config/zsh/.zshrc
+  ;;
+  *) echo Current shell is not bash or zsh; exit 1;
+  ;;
+esac
+
+# If ~/helper doesn't exist, do git clone
 if [ ! -d $SETTING_DIR ]; then
-  git clone --depth=1 --branch "$BRANCH" "$REMOTE" "$SETTING_DIR" || {
-      error "git clone of helper repo failed"
-      exit 1
-  }
+        git clone --depth=1 --branch "$BRANCH" "$REMOTE" "$SETTING_DIR" || {
+                error "git clone of helper repo failed"
+                exit 1
+        }
 fi
 
 # Write initial commands into .bashrc or .zshrc
-sed -i'.bak' "\^# $REPO^, /^$/ d" $RCFILE
+sed -i "\^$COMMENT_IN_RCFILE^, /^$/ d" $RCFILE
 cat >>$RCFILE <<EOF
 
-# $REPO
+$COMMENT_IN_RCFILE
 export SETTING_DIR=$SETTING_DIR
-source \$SETTING_DIR/bin/init/load-settings.sh
+source \$SETTING_DIR/$PROFILE
+
 EOF
 
+echo Add profile into $RCFILE
 cd "$SETTING_DIR" || exit 1
 make
-EOF
diff --git a/bin/init/load-settings.sh b/profile.sh
index cf1273a..9ebe755 100755
--- a/bin/init/load-settings.sh
+++ b/profile.sh
@@ -9,15 +9,12 @@ export XDG_STATE_HOME=~/.local/share/
 export MAIL=$HOME/Maildir
 if which nvim &>/dev/null; then
   export EDITOR=nvim
-  export VISUAL=nvim
-  export TIG_EDITOR=nvim
-  export GIT_EDITOR=nvim
 else
   export EDITOR=vim
-  export VISUAL=vim
-  export TIG_EDITOR=vim
-  export GIT_EDITOR=vim
 fi
+export VISUAL=$EDITOR
+export TIG_EDITOR=$EDITOR
+export GIT_EDITOR=$EDITOR
 
 # Get current shell
 shell=$(</proc/$$/cmdline sed -E 's/(.)-.+$/\1/' | tr -d '[\0\-]')
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 14d813b..f789ceb 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -78,9 +78,9 @@ vnoremap <leader>, :terminal<CR>
 map <leader>pp :setlocal paste!<cr>
 
 " Switch CDW to root git directory
-nnoremap <Leader>cg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
+nnoremap cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
 " Switch CWD to the directory of the open buffer
-map <leader>cd :cd %:p:h<cr>:pwd<cr>
+nnoremap cd :cd %:p:h<cr>:pwd<cr>
 
 " Move one line up and down
 nnoremap <C-j> ddp
diff --git a/vim/lua/configs/conform.lua b/vim/lua/configs/conform.lua
index 1b6683b..411336e 100644
--- a/vim/lua/configs/conform.lua
+++ b/vim/lua/configs/conform.lua
@@ -5,6 +5,8 @@ local options = {
     html = { "prettier" },
     markdown = { "prettier" },
     sh = {"shfmt"},
+    bash = {"shfmt"},
+    zsh = {"shfmt"},
   },
 
   -- format_on_save = {
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index fd58297..401c0f8 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -24,14 +24,6 @@ end, { desc = "format files" })
 vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" })
 
 -- tabufline
-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" })
-
 vim.keymap.set("n", "<leader>x", function()
   require("nvchad.tabufline").close_buffer()
 end, { desc = "buffer close" })
diff --git a/vim/lua/options.lua b/vim/lua/options.lua
index f9e6e7e..c16ae64 100644
--- a/vim/lua/options.lua
+++ b/vim/lua/options.lua
@@ -18,3 +18,5 @@ o.completeopt = 'menuone,noselect'
 
 -- NOTE: You should make sure your terminal supports this
 o.termguicolors = true
+
+o.whichwrap = "b,s"
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index 12f74f8..8c49369 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -30,6 +30,7 @@ return {
 
   {
     "stevearc/conform.nvim",
+    lazy = false,
     -- event = 'BufWritePre', -- uncomment for format on save
     config = function()
       require "configs.conform"