diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-10-27 10:04:31 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-10-27 10:04:31 -0200 |
| commit | 5f396a74aba1965674c4dc47020e789a3dbffa26 (patch) | |
| tree | e63f319710df7c632085fcff675aa7bc88f330ee /xsessionrc.dot.link | |
| parent | 071fc7ce09a5a595f6c3811b91c81b57f860c41a (diff) | |
| download | xsession-5f396a74aba1965674c4dc47020e789a3dbffa26.tar.gz xsession-5f396a74aba1965674c4dc47020e789a3dbffa26.tar.bz2 | |
Change some ordering, comment ssh-agent-loadkeys
Diffstat (limited to 'xsessionrc.dot.link')
| -rwxr-xr-x | xsessionrc.dot.link | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/xsessionrc.dot.link b/xsessionrc.dot.link index 5953ec4..f91821b 100755 --- a/xsessionrc.dot.link +++ b/xsessionrc.dot.link @@ -15,9 +15,6 @@ OSVERSION="`cut -d . -f 1 /etc/debian_version`" # Hostname HOSTNAME="`cat /etc/hostname`" -# Make sure to load the profile -. $HOME/.profile - # Start xscreensaver if [ -e "/usr/bin/xscreensaver" ]; then xscreensaver -no-splash & @@ -58,6 +55,21 @@ if [ -z "$WINDOW_MANAGER" ]; then WINDOW_MANAGER='awesome' fi +# Custom SSH_ASKPASS config +# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606934 +#export SSH_ASKPASS="/usr/bin/ssh-askpass-fullscreen" +#export SSH_ASKPASS="/usr/lib/pssh/pssh-askpass" +#export SSH_ASKPASS="" +export SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass" + +# SSH and GPG Agents +#if [ -x "$HOME/apps/utils-ssh/ssh-agent-loadkeys" ]; then +# . $HOME/apps/utils-ssh/ssh-agent-loadkeys +#fi + +# Make sure to load the profile +. $HOME/.profile + # Additional applications depending on the machine type #if laptop-detect; then # PROGRAMS="$PROGRAMS xwicd" @@ -140,18 +152,6 @@ fi # A window manager like Awesome may later start a new instance so it can appear at the wibar kill `pidof -x /usr/share/powerline/bindings/awesome/powerline-awesome.py` > /dev/null 2>&1 -# Custom SSH_ASKPASS config -# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606934 -#export SSH_ASKPASS="/usr/bin/ssh-askpass-fullscreen" -#export SSH_ASKPASS="/usr/lib/pssh/pssh-askpass" -#export SSH_ASKPASS="" -export SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass" - -# SSH and GPG Agents -if [ -x "$HOME/apps/utils-ssh/ssh-agent-loadkeys" ]; then - . $HOME/apps/utils-ssh/ssh-agent-loadkeys -fi - # Java config # See http://stackoverflow.com/questions/29494915/android-sdk-on-debian-linux-has-blank-windows # https://wiki.archlinux.org/index.php/Java#Non-reparenting_window_managers |