Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --git a/bash/.bash_profile b/bash/.bash_profile
index d1982c4e1314cba6d6a61c99f3b2a9970cc11c4e..422b20fed9aa23eb25c8963e52faa5f4f26147e1 100644 (file)
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,6 +1,7 @@
 export EDITOR="emc"
 export PAGER="/usr/bin/less -R"
 export PATH="/home/max/.local/bin:${PATH}"
+export TMPDIR="/home/max/.local/tmp"
 
 if [ -n "$BASH_VERSION" ]; then
   # include .bashrc if it exists
@@ -13,4 +14,4 @@ if [ -f /etc/bash_completion ]; then
   . /etc/bash_completion
 fi
 
-export TMPDIR="/home/max/.local/tmp"
+

diff --git a/bash/.bashrc b/bash/.bashrc
index 8d4422e7df195a31597f62d59f02678de5f5547c..c58049c1966f8934c922f0f2ebd81633efe1a8df 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,17 +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
-
-export GPG_AGENT_INFO="${GNUPGHOME:-${HOME}/.gnupg}/S.gpg-agent:-1:1"
-export GPG_TTY=$(tty)
+GPG_TTY=$(tty)
+export GPG_TTY
 
-# Use gpg-agent for SSH
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-    export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+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 udatestartuptty /bye >/dev/null
+

diff --git a/bash/.inputrc b/bash/.inputrc
index c362bfced6b81abe997d39f6cd85f05d8323e069..9d4ca57d5e52e0278bd64bdcaf3c19b044a4e77c 100644 (file)
--- a/bash/.inputrc
+++ b/bash/.inputrc
@@ -1,2 +1,4 @@
 set editing-mode vi
 set keymap vi-command
+
+set horizontal-scroll-mode Off