update lazygit theme

update backup script

.gitignore

@@ -1,2 +1,3 @@
 **/*/packer_compiled.lua
 .DS_Store
+lazygit/state.yml

backup.sh

@@ -1,21 +1,24 @@
 #!/bin/bash
 
-rm -rf nvim/lua/custom
+rm -rf ./nvim/lua/custom
 cp -aR ~/.config/nvim/lua/custom ./nvim/lua/
 
-rm -rf kitty
+rm -rf ./kitty
 cp -aR ~/.config/kitty ./
 
-rm -rf neofetch
+rm -rf ./neofetch
 cp -aR ~/.config/neofetch ./
 
-cp -a ~/.zshrc zsh/zshrc
+cp -aR ~/.zshrc zsh/zshrc
 
-rm -rf ranger
+rm -rf ./ranger
 cp -aR ~/.config/ranger ./
 
-rm -rf tmux/tmux.conf
-cp -aR ~/.tmux/tmux.conf tmux
+rm -rf ./tmux/tmux.conf
+cp -aR ~/.tmux/tmux.conf ./tmux
 
-rm -rf vim/.ideavimrc
-cp -aR ~/.ideavimrc vim
+rm -rf ideavim/.ideavimrc
+cp -aR ~/.ideavimrc ./ideavim/
+
+rm -rf ./lazygit/
+cp -aR ~/.config/lazygit ./

ideavim/.ideavimrc

@@ -2,7 +2,7 @@ let mapleader=" "
 
 """ Plugins  --------------------------------
 Plug 'easymotion/vim-easymotion'
-""" Plug 'preservim/nerdtree'
+Plug 'preservim/nerdtree'
 set NERDTree
 set surround
 set multiple-cursors
@@ -47,27 +47,36 @@ let g:EasyMotion_startofline = 0 " keep cursor column when JK motion
 
 nnoremap <leader>nh :nohl<CR>
 xnoremap p "_dP
+"" Code
 noremap gb viw
-nnoremap gh :action QuickJavaDoc<cr>
+"" nnoremap gh :action QuickJavaDoc<cr>
+nmap gh <Action>(ShowHoverInfo)
+"" nmap gy <Action>(ShowErrorDescription)
 nnoremap <leader>r :action RenameElement<CR>
 nmap <C-n> <Plug>NextWholeOccurrence
 xmap <C-n> <Plug>NextWholeOccurrence
 nnoremap <C-j> :action GotoNextError<CR>
 nnoremap <C-k> :action GotoPreviousError<CR>
+nmap gj :action FindUsages<CR>
+
 """ Switch windows
-nnoremap <leader>h <c-w>h
-nnoremap <leader>l <c-w>l
+nnoremap <C-h> <c-w>h
+nnoremap <C-l> <c-w>l
 """ nnoremap <leader>j <c-w>j
 """ nnoremap <leader>k <c-w>k
 """ nnoremap <leader>e :action ActivateProjectToolWindow<CR>
-""" nnoremap <leader>e :NERDTreeToggle<CR>
-nnoremap ;r :action FindInPath<CR>
-nnoremap <C-p> :action GotoFile<CR>
+nnoremap <leader>e :NERDTreeToggle<CR>
+""" nnoremap ;r :action FindInPath<CR>
+"" nnoremap <C-p> :action GotoFile<CR>
 """ Switch tabs
-nmap <C-i> :action NextTab<CR>
-nmap <C-o> :action PreviousTab<CR>
+nmap <S-l> :action NextTab<CR>
+nmap <s-h> :action PreviousTab<CR>
 """ nmap gh :action ShowErrorDescription<CR>
 
+"" Workspace
+nnoremap <leader>| :vs<CR>
+nnoremap <leader>_ :sp<CR>
+
 "" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t
 "" Map \r to the Reformat Code action
 "map \r <Action>(ReformatCode)
@@ -78,6 +87,12 @@ nmap <C-o> :action PreviousTab<CR>
 "" Map \b to toggle the breakpoint on the current line
 "map \b <Action>(ToggleLineBreakpoint)
 
+"" Debug
+nnoremap <leader>d :action ToggleLineBreakpoint<CR>
+nnoremap <leader><leader>r :action Run<CR>
+
+"" Extension
+set keep-english-in-normal
 
 " Find more examples here: https://jb.gg/share-ideavimrc
 

lazygit/config.yml

@@ -0,0 +1,2 @@
+os:
+  edit: "nvim"

lazygit/mocha-pink.yml

@@ -0,0 +1,23 @@
+gui:
+  theme:
+    activeBorderColor:
+      - '#f5c2e7'
+      - bold
+    inactiveBorderColor:
+      - '#a6adc8'
+    optionsTextColor:
+      - '#89b4fa'
+    selectedLineBgColor:
+      - '#313244'
+    selectedRangeBgColor:
+      - '#313244'
+    cherryPickedCommitBgColor:
+      - '#45475a'
+    cherryPickedCommitFgColor:
+      - '#f5c2e7'
+    unstagedChangesColor:
+      - '#f38ba8'
+    defaultFgColor:
+      - '#cdd6f4'
+    searchingActiveBorderColor:
+      - '#f9e2af'

zsh/zshrc

@@ -127,6 +127,9 @@ export https_proxy="http://localhost:10809"
 export PYENV_ROOT="$HOME/.pyenv"
 command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init -)"
+# lazygit config location and theme
+export CONFIG_DIR="$HOME/.config/lazygit"
+export LG_CONFIG_FILE="$CONFIG_DIR/config.yml,$CONFIG_DIR/mocha-pink.yml"
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh