diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2014-08-11 23:07:45 +0200 |
|---|---|---|
| committer | Johannes Löthberg <johannes@kyriasis.com> | 2014-08-11 23:07:45 +0200 |
| commit | 9b1c49e94726a5ae85db89a211c8ebf3290fe87c (patch) | |
| tree | bdbaebe54af3de42b6cec2a8f46f4cbcd64d54bd /zsh | |
| parent | 2ecc457acb953ab8e4f8d55b6b4d9f20e8af6fa8 (diff) | |
| download | dotfiles-9b1c49e94726a5ae85db89a211c8ebf3290fe87c.tar.xz | |
zprofile: Move ssh/gpg-agent things to profile-leeloo
Diffstat (limited to 'zsh')
| -rw-r--r-- | zsh/.zprofile | 23 | ||||
| -rw-r--r-- | zsh/profile-leeloo | 23 |
2 files changed, 25 insertions, 21 deletions
diff --git a/zsh/.zprofile b/zsh/.zprofile index 0871e85..a0ca536 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -41,27 +41,8 @@ export FQDN=$(hostname -f) # LS_COLORS is now required for `ls` to use colour source <(dircolors -b "$XDG_CONFIG_HOME"/dircolors) -function { - local envfile="$XDG_RUNTIME_DIR"/gpg-agent.env - if [[ -e "$envfile" ]] && kill -0 $(cut -d':' -f2 <"$envfile") &>/dev/null; then - source "$envfile" - else - source <(gpg-agent --daemon --write-env-file "$envfile") - export GPG_AGENT_INFO - fi -} - -function { - local envfile="$XDG_RUNTIME_DIR"/ssh-agent.env - local pid=$(awk -F'[=;]' 'FNR == 2 {print $2}' "$envfile" 2>/dev/null) - - if [[ -n "$pid" ]] && kill -0 "$pid" &>/dev/null; then - source "$envfile" >/dev/null - else - ssh-agent > "$envfile" - source "$envfile" >/dev/null - fi -} +[[ -f "$ZDOTDIR"/profile-"$(hostname -s)" ]] && \ + source "$ZDOTDIR"/profile-"$(hostname -s)" if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then exec startx "$XDG_CONFIG_HOME"/X11/xinitrc diff --git a/zsh/profile-leeloo b/zsh/profile-leeloo new file mode 100644 index 0000000..c74e1f7 --- /dev/null +++ b/zsh/profile-leeloo @@ -0,0 +1,23 @@ +function { + local envfile="$XDG_RUNTIME_DIR"/gpg-agent.env + if [[ -e "$envfile" ]] && kill -0 $(cut -d':' -f2 <"$envfile") &>/dev/null; then + source "$envfile" + else + source <(gpg-agent --daemon --write-env-file "$envfile") + export GPG_AGENT_INFO + fi +} + +function { + local envfile="$XDG_RUNTIME_DIR"/ssh-agent.env + local pid=$(awk -F'[=;]' 'FNR == 2 {print $2}' "$envfile" 2>/dev/null) + + if [[ -n "$pid" ]] && kill -0 "$pid" &>/dev/null; then + source "$envfile" >/dev/null + else + ssh-agent > "$envfile" + source "$envfile" >/dev/null + fi +} + +# vim: ft=zsh: |