summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/bash/rc.sh4
-rw-r--r--.config/login.d/01_xdg.sh7
-rw-r--r--.config/login.d/02_tmpdir.sh1
-rw-r--r--.config/login.d/10_less.sh2
-rw-r--r--.config/login.d/90_dot-runtime.sh5
-rw-r--r--.config/ssh/config17
6 files changed, 24 insertions, 12 deletions
diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh
index ab690cf..7df0373 100644
--- a/.config/bash/rc.sh
+++ b/.config/bash/rc.sh
@@ -5,6 +5,10 @@
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
+# GDM failsafe ignores profile (login) settings, but I use XDG stuff
+# here.
+. "${XDG_CONFIG_HOME:-$HOME/.config}"/login.d/??_xdg.sh
+
# Why is this not on by default?
# "We have a cached value, but it isn't valid anymore. Should we trash it?"
# "Duh, yes!"
diff --git a/.config/login.d/01_xdg.sh b/.config/login.d/01_xdg.sh
index 07cea90..d415608 100644
--- a/.config/login.d/01_xdg.sh
+++ b/.config/login.d/01_xdg.sh
@@ -29,9 +29,10 @@ if [[ -z $XDG_RUNTIME_DIR ]] && type flock &>/dev/null; then
fi
if ! [[ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/.lock" ]]; then
exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock"
- fi
- if flock -sn 7; then
- trap _diy_xdg_runtime_logout EXIT
+ if flock -sn 7; then
+ # Unfortunately this doesn't survive across exec(1).
+ trap _diy_xdg_runtime_logout EXIT
+ fi
fi
}
_diy_xdg_runtime_logout() {
diff --git a/.config/login.d/02_tmpdir.sh b/.config/login.d/02_tmpdir.sh
index d0079aa..c0d5f18 100644
--- a/.config/login.d/02_tmpdir.sh
+++ b/.config/login.d/02_tmpdir.sh
@@ -1,3 +1,2 @@
mkdir -p -- "$XDG_RUNTIME_DIR/tmpdir"
export TMPDIR="$XDG_RUNTIME_DIR/tmpdir"
-ln -sfT -- "$TMPDIR" "$HOME/tmp"
diff --git a/.config/login.d/10_less.sh b/.config/login.d/10_less.sh
new file mode 100644
index 0000000..c5934d6
--- /dev/null
+++ b/.config/login.d/10_less.sh
@@ -0,0 +1,2 @@
+export LESSHISTFILE="$XDG_CACHE_HOME/less/histfile"
+mkdir -p -- "${LESSHISTFILE%/*}"
diff --git a/.config/login.d/90_dot-runtime.sh b/.config/login.d/90_dot-runtime.sh
index d597cc7..87d30ec 100644
--- a/.config/login.d/90_dot-runtime.sh
+++ b/.config/login.d/90_dot-runtime.sh
@@ -1 +1,4 @@
-ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime
+# This is really only needed for ssh ControlPath; as I don't have a
+# way to communicate XD
+mkdir -p -- ~/.runtime
+ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime/"$HOSTNAME"
diff --git a/.config/ssh/config b/.config/ssh/config
index 7bab06d..07240a6 100644
--- a/.config/ssh/config
+++ b/.config/ssh/config
@@ -1,7 +1,7 @@
Host *
Protocol 2
ControlMaster auto
- ControlPath ~/.runtime/ssh-%r@%h:%p
+ ControlPath ~/.runtime/%l/ssh-%r@%h:%p
Compression yes
# Purdue ###################################################
@@ -26,12 +26,15 @@ Host lukeshu.com
User lukeshu
Host build64-par
- Port 22
User luke
- ForwardX11 yes
- ForwardX11Trusted yes
-Host build64-par-far
- Port 1864
HostName lukeshu.com
- User luke
+ Port 1864
+ ForwardX11 no
+ ForwardX11Trusted no
+
+ Match host %h.lan.
+ HostName build64-par
+ Port 22
+ ForwardX11 yes
+ ForwardX11Trusted yes