mirrors
/
ambevar-dotfiles
mirror of https://gitlab.com/ambrevar/dotfiles/
1
0
Fork 0
Code Issues Releases Wiki Activity

Mutt: change-folder shortcuts. 

Shell: fixed ssh-agent daemon.
master
Pierre Neidhardt 2013-05-04 13:40:48 +02:00
parent 0d9cd190b8
commit fae58532d5
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.muttrc
View File

@ -84,10 +84,14 @@ source "ccat ~/.mutt-pwds.cpt |"
## Last account is default. ## Last account is default.
source "~/.mutt/$my_ac_work" source "~/.mutt/$my_ac_work"
folder-hook $folder 'source ~/.mutt/$my_ac_work' folder-hook $folder 'source ~/.mutt/$my_ac_work'
source "~/.mutt/$my_ac_university"
folder-hook $folder 'source ~/.mutt/$my_ac_university'
source "~/.mutt/$my_ac_personal" source "~/.mutt/$my_ac_personal"
folder-hook $folder 'source ~/.mutt/$my_ac_personal' folder-hook $folder 'source ~/.mutt/$my_ac_personal'
source "~/.mutt/$my_ac_university"
folder-hook $folder 'source ~/.mutt/$my_ac_university'
macro index,pager <f2> '<enter-command>source ~/.mutt/$my_ac_work<enter><change-folder>!<enter>'
macro index,pager <f3> '<enter-command>source ~/.mutt/$my_ac_personal<enter><change-folder>!<enter>'
macro index,pager <f4> '<enter-command>source ~/.mutt/$my_ac_university<enter><change-folder>!<enter>'
##------------------------------------------------------------------------------ ##------------------------------------------------------------------------------
## Sidebar ## Sidebar

25
.shell.d/main_rc
View File

@ -104,15 +104,18 @@ export EDITOR
#esac #esac
## SSH-Agent ## SSH-Agent
## WARNING: this is somewhat insecure. avoid using it on a mutli-user machine. ## WARNING: this is somewhat insecure. Avoid using it on a mutli-user machine.
SSH_ENV_FILE="/tmp/ssh-agent-env" if [ -n "$(command -v ssh-agent)" ]; then
if [ $(ps ax -o command="" | grep -c "ssh-agent") -eq 2 ]; then SSH_ENV_FILE="/tmp/ssh-agent-env"
SSH_AGENT_VARS=$(ssh-agent) if [ $(ps ax -o command="" | grep -c "ssh-agent") -eq 1 ]; then
eval $(echo "${SSH_AGENT_VARS}") SSH_AGENT_VARS=$(ssh-agent)
echo "${SSH_AGENT_VARS}" | sed '2q' | cut -d'=' -f2 | cut -d';' -f1 > "$SSH_ENV_FILE" eval $(echo "${SSH_AGENT_VARS}")
chmod 444 "$SSH_ENV_FILE" echo "${SSH_AGENT_VARS}" | sed '2q' | cut -d'=' -f2 | cut -d';' -f1 > "$SSH_ENV_FILE"
unset $SSH_AGENT_VARS chmod 444 "$SSH_ENV_FILE"
elif [ -f "$SSH_ENV_FILE" ]; then unset $SSH_AGENT_VARS
SSH_AUTH_SOCK=$(sed -n '1{p;q}' "$SSH_ENV_FILE") ; export SSH_AUTH_SOCK elif [ -f "$SSH_ENV_FILE" ]; then
SSH_AGENT_PID=$(sed -n '2{p;q}' "$SSH_ENV_FILE") 2>/dev/null ; export SSH_AGENT_PID SSH_AUTH_SOCK=$(sed -n '1{p;q}' "$SSH_ENV_FILE") ; export SSH_AUTH_SOCK
SSH_AGENT_PID=$(sed -n '2{p;q}' "$SSH_ENV_FILE") 2>/dev/null ; export SSH_AGENT_PID
fi
unset SSH_ENV_FILE
fi fi