projects
/
~bandali
/
configs
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update primary Canonical mail and a few other small tweaks
[~bandali/configs]
/
.xinitrc
diff --git
a/.xinitrc
b/.xinitrc
index
a888a36
..
ffb1aa0
100755
(executable)
--- a/
.xinitrc
+++ b/
.xinitrc
@@
-1,12
+1,9
@@
# -*- mode: sh; sh-shell: sh -*-
# -*- mode: sh; sh-shell: sh -*-
-#if [ -f "$HOME/.profile" ]; then
-# . "$HOME/.profile";
-#fi
-
if [ -f "$HOME/.local/bin/startup-progs" ]; then
. "$HOME/.local/bin/startup-progs"
fi
if [ -f "$HOME/.local/bin/startup-progs" ]; then
. "$HOME/.local/bin/startup-progs"
fi
-# LC_ALL=C twm &
-[ -x "$(command -v emacs)" ] && exec ssh-agent emacs -ib 0
+# launch with dbus in part so that pinentry-gnome3 -- seemingly the
+# pinentry du jour -- doesn't fall back to curses and screw us.
+[ -x "$(command -v emacs)" ] && dbus-run-session ssh-agent emacs -ib 0