commit 6979cc18a5021170e85e286b12bb6253a2773bee parent 2a08731e12f40457eef0ba246022ce200964af9e Author: Yohanes Bandung Bondowoso <hi@ybbond.id> Date: Sun, 23 May 2021 15:37:40 +0700 zsh and git config updates Diffstat:
| M | .gitconfig | | | 23 | +++++++++++++---------- |
| M | .zshrc | | | 17 | ++++++++++------- |
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/.gitconfig b/.gitconfig @@ -13,6 +13,8 @@ ; histi = "log --pretty=format:'%C(yellow)[%ad]%C(reset) %C(green)[%h]%C(reset) | %C(red)%s %C(bold red){{%an}}%C(reset) %C(blue)%d%C(reset)' --graph --date=short --max-count=20" hist = "--no-pager log --pretty=format:'%C(yellow)%h%C(reset) %C(green)%ad%C(reset) | %C(reset)%s %C(bold)[%an]%C(reset) %C(blue)%d%C(reset)' --graph --date=short --max-count=20" hist40 = "--no-pager log --pretty=format:'%C(yellow)%h%C(reset) %C(green)%ad%C(reset) | %C(reset)%s %C(bold)[%an]%C(reset) %C(blue)%d%C(reset)' --graph --date=short --max-count=40" + lab = "!lab" + hub = "!hub" [user] name = Yohanes Bandung Bondowoso @@ -30,7 +32,8 @@ [core] excludesfile = /Users/yohanesbandung/.gitignore_global - pager = delta --light + pager = cat + ; pager = delta --light [commit] template = /Users/yohanesbandung/.stCommitMsg @@ -38,14 +41,14 @@ [fetch] prune = false -[interactive] - diffFilter = delta --color-only --light +; [interactive] +; diffFilter = delta --color-only --light -[delta] - features = side-by-side line-numbers decorations - whitespace-error-style = 22 reverse +; [delta] +; features = side-by-side line-numbers decorations +; whitespace-error-style = 22 reverse -[delta "decorations"] - commit-decoration-style = bold yellow box ul - file-style = bold yellow ul - file-decoration-style = none +; [delta "decorations"] +; commit-decoration-style = bold yellow box ul +; file-style = bold yellow ul +; file-decoration-style = none diff --git a/.zshrc b/.zshrc @@ -87,7 +87,7 @@ SPACESHIP_TIME_SUFFIX=']' # DISABLE_LS_COLORS="true" # Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" +DISABLE_AUTO_TITLE="true" # Uncomment the following line to enable command auto-correction. # ENABLE_CORRECTION="true" @@ -118,7 +118,9 @@ SPACESHIP_TIME_SUFFIX=']' # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git npm yarn zsh-autosuggestions zsh-syntax-highlighting history-substring-search zsh-vi-mode) +plugins=(git npm yarn zsh-autosuggestions zsh-syntax-highlighting history-substring-search vi-mode) + +bindkey -M viins 'jk' vi-cmd-mode source $ZSH/oh-my-zsh.sh @@ -152,7 +154,8 @@ export PATH="$HOME/.emacs.d/bin:$PATH" # export PATH=$HOME/bin:$PATH # export BAT_THEME="Monokai Extended Bright" -export BAT_THEME="GitHub" +# export BAT_THEME="GitHub" +export BAT_THEME="Coldark-Dark" export ANDROID_HOME=${HOME}/Library/Android/sdk export JAVA_HOME=/Applications/Android\ Studio.app/Contents/jre/jdk/Contents/Home @@ -284,20 +287,20 @@ alias rehead="git reset HEAD~" alias lg="lazygit" # misc -alias nexus5x="~/Library/Android/sdk/emulator/emulator -avd Nexus_5X_API_25 -netdelay none -netspeed full" +alias nexus5x="~/Library/Android/sdk/emulator/emulator -avd Nexus_5X_API_29 -netdelay none -netspeed full" alias konak="kantal 10 yarn add" alias cdb="cd .." # better cli alias ls='exa' -# alias top='btm --color=default-light' -# alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)" -alias top='btm' alias cat="bat" alias find='fd' alias du='ncdu --color dark -rr' +alias set_dark="cp ~/.tmux-dark.conf ~/.tmux.conf && cp ~/.config/kitty/kitty-dark.conf ~/.config/kitty/kitty.conf" +alias set_light="cp ~/.tmux-light.conf ~/.tmux.conf && cp ~/.config/kitty/kitty-light.conf ~/.config/kitty/kitty.conf" + source <(lab completion zsh) ########################################################################