From a58e033e366f7a5776e6d53ac45b44a426aadbd2 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 19 Jul 2016 12:47:01 +0200
Subject: zsh: Setup SSH auth sock if empty

---
 tag-zsh/config/zsh/zshrc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tag-zsh/config/zsh')

diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc
index 3e568cd4..7fcacd3a 100644
--- a/tag-zsh/config/zsh/zshrc
+++ b/tag-zsh/config/zsh/zshrc
@@ -96,6 +96,11 @@ bindkey '\e	' hist-complete
 zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' '+m:{A-Z}={a-z}'
 zstyle ':completion:*' completer _expand _complete _match
 
+if [[ -z $SSH_AUTH_SOCK && $commands[ssh-agent] ]]
+then
+	eval $(ssh-agent)
+fi
+
 if zplug check Tarrasch/zsh-autoenv
 then
 	AUTOENV_FILE_ENTER=.envrc
-- 
cgit 1.4.1


From 0f756df9afe3476cd4bef8fac54a5cbdb93080e8 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 19 Jul 2016 12:55:36 +0200
Subject: zsh: Improve use of pure prompt

- Don’t initialise it in a dumb terminal
- Fallback to a “light” version if it’s not installed
---
 tag-zsh/config/zsh/zshrc | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

(limited to 'tag-zsh/config/zsh')

diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc
index 7fcacd3a..ddcdfbd7 100644
--- a/tag-zsh/config/zsh/zshrc
+++ b/tag-zsh/config/zsh/zshrc
@@ -2,8 +2,8 @@
 source $ZPLUG_HOME/init.zsh
 
 zplug "zsh-users/zsh-completions"
-zplug "mafredri/zsh-async", use:async.zsh
-zplug "sindresorhus/pure", on:"mafredri/zsh-async", as:plugin, use:pure.zsh
+zplug "mafredri/zsh-async", use:async.zsh, if:"[[ $TERM != \"dumb\" ]]"
+zplug "sindresorhus/pure", on:"mafredri/zsh-async", as:plugin, use:pure.zsh, if:"[[ $TERM != \"dumb\" ]]"
 zplug "Tarrasch/zsh-autoenv", as:plugin
 zplug "clvv/fasd", hook-build:"PREFIX=$HOME make install"
 zplug "alanpearce/zsh-directory-history", at:"dirlog-as-zsh-function", as:command, use:"dirhist"
@@ -129,10 +129,37 @@ then
 	autoload -U compinit && compinit
 fi
 
-if zplug check sindresorhus/pure
+if [[ $TERM == "dumb" ]]
 then
-	autoload -Uz promptinit && promptinit
-	prompt pure &> /dev/null
+	PROMPT="> "
+else
+	if zplug check sindresorhus/pure
+	then
+		autoload -Uz promptinit && promptinit
+		prompt pure &> /dev/null
+	else
+		autoload -Uz vcs_info
+
+		zstyle ':vcs_info:*' enable git
+		zstyle ':vcs_info:*' use-simple true
+		# only export two msg variables from vcs_info
+		zstyle ':vcs_info:*' max-exports 2
+		# vcs_info_msg_0_ = ' %b' (for branch)
+		# vcs_info_msg_1_ = 'x%R' git top level (%R), x-prefix prevents creation of a named path (AUTO_NAME_DIRS)
+		zstyle ':vcs_info:git*' formats ' %b' 'x%R'
+		zstyle ':vcs_info:git*' actionformats ' %b|%a' 'x%R'
+
+		# show username@host if logged in through SSH
+		[[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username=' %F{242}%n@%m%f'
+
+		# show username@host if root, with username in white
+		[[ $UID -eq 0 ]] && prompt_pure_username=' %F{white}%n%f%F{242}@%m%f'
+
+		setopt prompt_subst
+		setopt prompt_cr
+		PROMPT='%F{blue}%~%f%F{242}${vcs_info_msg_0_}%f${prompt_pure_username}
+%(?.%F{magenta}.%F{red})>%f '
+	fi
 fi
 
 if zplug check clvv/fasd
-- 
cgit 1.4.1


From 84e5cb9fcc9faa1c846e12ec7234e24c18f1fab7 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 22 Jul 2016 14:40:22 +0200
Subject: zsh: Bind directory-history search keys

---
 tag-zsh/config/zsh/zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tag-zsh/config/zsh')

diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc
index ddcdfbd7..63384f55 100644
--- a/tag-zsh/config/zsh/zshrc
+++ b/tag-zsh/config/zsh/zshrc
@@ -183,8 +183,8 @@ fi
 if zplug check alanpearce/zsh-directory-history
 then
 	unsetopt flow_control 			# Let me use ^S and ^Q
-	# bindkey '\e[A' directory-history-search-backward
-	# bindkey '\e[B' directory-history-search-forward
+	bindkey '\e[B' directory-history-search-backward
+	bindkey '\e[A' directory-history-search-forward
 
 	bindkey -M emacs '^R' history-substring-search-up
 	bindkey -M emacs '^S' history-substring-search-down
-- 
cgit 1.4.1