summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-10-12 19:32:52 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-10-12 19:32:52 -0400
commita43392bd756cc5fcaa7e10871d5cf0da1096f60c (patch)
treefedcc1ae476a8ce592f027ae9c3e94ab4c3f5603
parenta7bc24e6d61ff13dbac010ffbb0384cf41bd8270 (diff)
parentab764565762ea507c642c4c422d5980b06279c9c (diff)
Merge remote-tracking branch 'origin/master' into thinkpenguin-par
-rw-r--r--.config/ssh/config8
-rw-r--r--.config/wmii-hg/include.sh4
-rw-r--r--.local/lib/xdg.sh2
3 files changed, 7 insertions, 7 deletions
diff --git a/.config/ssh/config b/.config/ssh/config
index 894af44..c020c5e 100644
--- a/.config/ssh/config
+++ b/.config/ssh/config
@@ -5,12 +5,12 @@ Host *
Compression yes
Host lore
- HostName lore.cs.purdue.edu
- User shumakl
+ HostName lore.cs.purdue.edu
+ User shumakl
Host data
- HostName data.cs.purdue.edu
- User shumakl
+ HostName data.cs.purdue.edu
+ User shumakl
Host repo
Port 1863
diff --git a/.config/wmii-hg/include.sh b/.config/wmii-hg/include.sh
index 38551aa..bd9456f 100644
--- a/.config/wmii-hg/include.sh
+++ b/.config/wmii-hg/include.sh
@@ -1,10 +1,10 @@
#!/bin/bash
if [[ -z "$WMII_NAMESPACE" ]]; then
- export WMII_NAMESPACE="`wmiir namespace`"
+ export WMII_NAMESPACE="`wmiir namespace`"
fi
if [[ -z "$WMII_DIR" ]]; then
- export WMII_DIR="$HOME/n/wmii"
+ export WMII_DIR="$HOME/n/wmii${DISPLAY}"
fi
. util.sh
diff --git a/.local/lib/xdg.sh b/.local/lib/xdg.sh
index 44aeee2..2241d2e 100644
--- a/.local/lib/xdg.sh
+++ b/.local/lib/xdg.sh
@@ -8,7 +8,7 @@
[[ -n $XDG_DATA_HOME ]] || export XDG_DATA_HOME="$HOME/.local/share"
[[ -n $XDG_CONFIG_HOME ]] || export XDG_CONFIG_HOME="$HOME/.config"
[[ -n $XDG_DATA_DIRS ]] || export XDG_DATA_DIRS="/usr/local/share/:/usr/share/"
-[[ -n $XDG_CONFIG_IRS ]] || export XDG_CONFIG_DIRS="/etc/xdg"
+[[ -n $XDG_CONFIG_DIRS ]] || export XDG_CONFIG_DIRS="/etc/xdg"
[[ -n $XDG_CACHE_HOME ]] || export XDG_CACHE_HOME="$HOME/.cache"
# Check if XDG_RUNTIME_DIR is set, but has a bogus setting