gpg key changed

This commit is contained in:
Frank Villaro-Dixon 2013-11-11 09:36:29 +01:00
parent 623cb85fde
commit d00dc75317
4 changed files with 17 additions and 10 deletions

17
bashrc
View file

@ -450,12 +450,12 @@ function bpm
}
# }}}
SSHAGENT=/usr/bin/ssh-agent
SSHAGENTARGS="-s"
if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
eval `$SSHAGENT $SSHAGENTARGS`
trap "kill $SSH_AGENT_PID" 0
fi
#SSHAGENT=/usr/bin/ssh-agent
#SSHAGENTARGS="-s"
#if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
# eval `$SSHAGENT $SSHAGENTARGS`
# trap "kill $SSH_AGENT_PID" 0
#fi
###############
### EXPORTS ###
@ -465,7 +465,8 @@ export EDITOR="vim"
GPG_TTY=`tty`
export GPG_TTY
export GPGKEY=6F36914A
#export GPGKEY=6F36914A
export GPGKEY=016106A6AF223DBE
export PYTHONPATH=/usr/local/lib/python2.7/dist-packages
export CC=clang
@ -481,6 +482,6 @@ export PATH=$PATH:~/Programmation/dotfiles/Utils
export PATH="$HOME/opt/cross/bin:$PATH"
#Launch startx when login
[[ -z $DISPLAY && $XDG_VTNR -le 4 && -z $SSH_CLIENT ]] && exec startx
##[[ -z $DISPLAY && $XDG_VTNR -le 4 && -z $SSH_CLIENT ]] && exec startx
calendar -f ~/calendar

View file

@ -3,7 +3,9 @@ set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f"
set pgp_sign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
set pgp_clearsign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x3D4CD4F96F36914A -- -r %r -- %f"
set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x016106A6AF223DBE -- -r %r -- %f"
set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x3D4CD4F96F36914A -- -r %r -- %f"
set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x016106A6AF223DBE -- -r %r -- %f"
set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x3D4CD4F96F36914A -- -r %r -- %f"
set pgp_import_command="gpg --no-verbose --import -v %f"
set pgp_export_command="gpg --no-verbose --export --armor %r"
@ -12,7 +14,8 @@ set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys
set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
# specify the uid to use when encrypting/signing
set pgp_sign_as=0x3D4CD4F96F36914A
##set pgp_sign_as=0x3D4CD4F96F36914A
set pgp_sign_as=0x016106A6AF223DBE
# this set the number of seconds to keep in memory the passpharse used to encrypt/sign
# the more the less secure it will be

View file

@ -7,3 +7,4 @@ i
printf
connectique
recontacte
m'enfin

View file

@ -142,6 +142,8 @@ autocmd BufRead,BufNewFile *.tex set tw=80
autocmd BufRead,BufNewFile *.latex set tw=80
autocmd BufRead,BufNewFile *.lista set filetype=lisp
autocmd BufRead,BufNewFile *.m set nospell
"Automatic documentation
autocmd BufNewFile,BufRead *.py set keywordprg=pydoc