Fix things

diff --git a/X/.xinitrc b/X/.xinitrc
index 86e176b10564f58dcabe8a3196890977d7c9ad89..60e56eb6bde8dd6e088ca61bb9e08f0f9281728a 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -39,7 +39,7 @@ esac
 # Set screen layout
 case $HOSTNAME in
     beryllium)
-       xrandr --output HDMI1 --left-of VGA1 
+       xrandr --output HDMI-1 --left-of DVI-I-1 
        ;;
     *)
        ;;
@@ -54,12 +54,12 @@ feh --bg-scale ~/Pictures/background.jpg&
 
 xset -b
 
-if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
-    eval $(gpg-agent --daemon \
-                    --use-standard-socket \
-                    --write-env-file "${HOME}/.gpg-agent-info")
-fi
-
-gpg-connect-agent updatestartuptty /bye >/dev/null
+#if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
+#    eval $(gpg-agent --daemon \
+#                   --use-standard-socket \
+#                   --write-env-file "${HOME}/.gpg-agent-info")
+#fi
+#
+#gpg-connect-agent updatestartuptty /bye >/dev/null
 
 exec /usr/bin/ratpoison

diff --git a/bash/.bashrc b/bash/.bashrc
index 3bf2436ee46d77555c31ebec35e180fc0e19c76c..dd39849bfcb7f7a6d98dcbc9def4ebbd20a6f0fd 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,6 +123,14 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
+if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
+  gpg-connect-agent /bye >/dev/null 2>&1
+fi
+
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
+fi
 
-GPG_TTY=$(tty)
-export GPG_TTY
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null

diff --git a/vim/.vimrc b/vim/.vimrc
index 999ce8aa8dd3fb4cac52ed89494af35cb3bb5c63..d30a086ebe1975ee4a6ac425a25cfd1d42fd9e5a 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -32,11 +32,15 @@ Plugin 'vim-scripts/MatlabFilesEdition'
 Plugin 'flazz/vim-colorschemes'
 Plugin 'benmills/vimux'
 Plugin 'tmhedberg/SimpylFold'
+Plugin 'saltstack/salt-vim'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
 
+" Swapfiles
+set backupdir=$HOME/.vim/backup//
+
 " Random look and feel stuff
 syntax on
 set background=dark