X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fzsh%2Ffiles%2Fzshrc;h=86ecdf41006c67a2ea2df8f60e8f82528e6aab4f;hb=6ac5d1d068dc7fa7596e8356c815f5db750ebd63;hp=6fe4aafd4d01e20eef19068a05b8cbbaee1b0cec;hpb=dd0b905788ae2041f7eb8d6c18220e59d951c5f7;p=max%2Fsaltfiles.git

diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 6fe4aaf..86ecdf4 100644
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -28,34 +28,20 @@ unsetopt beep notify
 bindkey -v
 # End of lines configured by zsh-newuser-install
 
-
-git_prompt() {
-	ref=$(git symbolic-ref HEAD | cut -d'/' -f3-)
-	echo $ref
-}
-
+# Prompt
 NEWLINE=$'\n'
 setopt prompt_subst
-autoload -Uz vcs_info
-zstyle ':vcs_info:*' actionformats \
-    "%F{5}[%f%b%F{3}|%F{1}%a%F{5}]%f${NEWLINE}"
-zstyle ':vcs_info:*' formats       \
-    "%F{5}[%f%b%F{5}]%f${NEWLINE}"
 
-zstyle ':vcs_info:*' enable git
+p="%(?;%F{green};%F{red})[%h]%f "
+p+="%F{red}%B%n%b%f@%F{red}%B%m%b%f"
+p+=":%F{blue}%~%f"
+p+="${NEWLINE}%(!.#.$) "
 
-# or use pre_cmd, see man zshcontrib
-precmd() {
-	echo
-	vcs_info
+source ~/.git-prompt.sh
+precmd () {
+	__git_ps1 "" "${p}" "${NEWLINE}[%s]${NEWLINE}"
 }
 
-prompt='$vcs_info_msg_0_'
-prompt+="%(?;%F{green};%F{red})[%h]%f "
-prompt+="%F{red}%B%n%b%f@%F{red}%B%m%b%f"
-prompt+=":%F{blue}%~%f"
-prompt+="${NEWLINE}%(!.#.$) "
-
 if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
   gpg-connect-agent /bye >/dev/null 2>&1
 fi
@@ -65,4 +51,11 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
   export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 fi
 
+
 gpg-connect-agent updatestartuptty /bye > /dev/null
+
+bindkey '^R' history-incremental-search-backward
+
+if [[ -f ~/.shell_aliases ]]; then
+	source ~/.shell_aliases
+fi