mirror of
https://github.com/Matir/skel.git
synced 2026-05-25 21:19:09 -07:00
Rearrange GPG startup.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
# Setup GPG Agent
|
||||
if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
|
||||
GPG_AGENT_INFO_PATH=$HOME/.gnupg/gpg-agent-info-`hostname`
|
||||
if test -f $GPG_AGENT_INFO_PATH && kill -0 `cut -d: -f 2 $GPG_AGENT_INFO_PATH` 2>/dev/null ; then
|
||||
. $GPG_AGENT_INFO_PATH
|
||||
@@ -10,8 +11,5 @@ else
|
||||
fi
|
||||
unset GPG_AGENT_INFO_PATH
|
||||
export GPG_TTY=`tty`
|
||||
fi
|
||||
# End GPG
|
||||
|
||||
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
|
||||
|
||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
|
||||
|
||||
@@ -20,11 +20,6 @@ esac
|
||||
autoload -U colors && colors
|
||||
PS1="%{%(!.$fg[red].$fg[green])%}%n%{$fg[white]%}@%{$fg[cyan]%}%m%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[white]%}%#%{$reset_color%} "
|
||||
|
||||
# .profile is universal
|
||||
. ~/.profile
|
||||
# Deduplicate the path
|
||||
typeset -U path
|
||||
|
||||
# LS Colors
|
||||
alias ls='ls --color'
|
||||
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
|
||||
@@ -40,6 +35,13 @@ if [ -d $HOME/.oh-my-zsh ] ; then
|
||||
unset ZSH_CUSTOM
|
||||
fi
|
||||
|
||||
# .profile is universal
|
||||
# but after oh-my-zsh to use anything setup there
|
||||
. ~/.profile
|
||||
# Deduplicate the path
|
||||
typeset -U path
|
||||
|
||||
|
||||
# Keybindings
|
||||
bindkey '^[[A' history-search-backward
|
||||
bindkey '^[[B' history-search-forward
|
||||
|
||||
Reference in New Issue
Block a user