dot_zshrc.tmpl

@@ -64,76 +64,39 @@ ZSH_THEME="spaceship"
 # 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=(fzf sdk nodenv zsh-autosuggestions zsh-syntax-highlighting)
+plugins=(fzf sdk nodenv)
 
 source $ZSH/oh-my-zsh.sh
 
 
 # ---------------------------------------------------------------------------
-#  USER CONFIGURATION
+#  User configuration
 # ---------------------------------------------------------------------------
 
-export FAVORITE_COMMAND1="{{ .tmux_favorite1 }}"
-export FAVORITE_COMMAND2="{{ .tmux_favorite2 }}"
-export FAVORITE_COMMAND3="{{ .tmux_favorite3 }}"
-export FAVORITE_COMMAND4="{{ .tmux_favorite4 }}"
-
-alias cdd='cd {{ .deploydir }}'
-export cdd={{ .deploydir }}
-
-if [[ -f "$HOME/.zshrc.local" ]]; then
-  source "$HOME/.zshrc.local"
-fi
-
-# ---------------------------------------------------------------------------
-#  History
-# ---------------------------------------------------------------------------
-
-# set the maximum number of lines to be saved in the history file
-export HISTSIZE="50000"
-export SAVEHIST="$HISTSIZE"
-
-# append new history entries to the history file
-setopt APPEND_HISTORY
-
-# save each command to the history file as soon as it is executed
-setopt INC_APPEND_HISTORY
+autoload -U compinit
+compinit
 
-# ignore recording duplicate consecutive commands in the history
-setopt HIST_IGNORE_DUPS
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
 
-# ignore commands that start with a space in the history
-setopt HIST_IGNORE_SPACE
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='nvim'
+# fi
 
-# ---------------------------------------------------------------------------
-#  Git
-# ---------------------------------------------------------------------------
 
 if command -v tig &>/dev/null; then
   alias tiga='tig --all'
 fi
 
-# ---------------------------------------------------------------------------
-#  Editor
-# ---------------------------------------------------------------------------
-
-if hash nvim 2>/dev/null; then
-  export EDITOR=nvim
-elif hash vim 2>/dev/null; then
-  export EDITOR=vim
-elif hash vi 2>/dev/null; then 
-  export EDITOR=vi
-else
-  export EDITOR=nano
-fi
+alias cdd='cd {{ .deploydir }}'
+export cdd={{ .deploydir }}
 
-export SVN_EDITOR=$EDITOR
-export GIT_EDITOR=$EDITOR
-export VISUAL=$EDITOR
-alias vi=$EDITOR
 
 # ---------------------------------------------------------------------------
-#  Tmux
+#  TMUX
 # ---------------------------------------------------------------------------
 
 # Function to set tmux window title
@@ -163,8 +126,14 @@ function ssh() {
     fi
 }
 
+export FAVORITE_COMMAND1="{{ .tmux_favorite1 }}"
+export FAVORITE_COMMAND2="{{ .tmux_favorite2 }}"
+export FAVORITE_COMMAND3="{{ .tmux_favorite3 }}"
+export FAVORITE_COMMAND4="{{ .tmux_favorite4 }}"
+
+
 # ---------------------------------------------------------------------------
-#  Fzf
+#  FZF
 # ---------------------------------------------------------------------------
 
 if command -v fzf &>/dev/null; then
@@ -183,7 +152,7 @@ fi
 
 
 # ---------------------------------------------------------------------------
-#  Sdkman
+#  SDKMAN
 # ---------------------------------------------------------------------------
 
 export SDKMAN_DIR="$HOME/.sdkman"
@@ -191,7 +160,7 @@ export SDKMAN_DIR="$HOME/.sdkman"
 
 
 # ---------------------------------------------------------------------------
-#  Maven
+#  MAVEN
 # ---------------------------------------------------------------------------
 
 if command -v mvn &>/dev/null; then

private_dot_config/spaceship.zsh

@@ -1,15 +1,10 @@
-# Never display time
+# Display time
 SPACESHIP_TIME_SHOW=false
 
-# Never display user
+# Display username always
 SPACESHIP_USER_SHOW=false
 
 # Do not truncate path in repos
 SPACESHIP_DIR_TRUNC_REPO=false
 
-# Never display jobs
 SPACESHIP_JOBS_SHOW=false
-
-# Async display git branch
-# and apply workaround in spaceship code: https://github.com/spaceship-prompt/spaceship-prompt/issues/1193
-SPACESHIP_GIT_BRANCH_ASYNC=true