From 865a768e44624c465e9d42c6ca91d0ef29a8e7ad Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 7 Feb 2015 00:26:11 -0500
Subject: backport changes from cs-purdue

---
 .config/X11/login         | 2 +-
 .config/bash/logout.sh    | 9 +++------
 .config/emacs/init.el     | 5 ++++-
 .config/login.d/01_xdg.sh | 7 +++----
 .config/symlinks          | 1 +
 5 files changed, 12 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 .config/X11/login

(limited to '.config')

diff --git a/.config/X11/login b/.config/X11/login
old mode 100644
new mode 100755
index 03bad2a..84931df
--- a/.config/X11/login
+++ b/.config/X11/login
@@ -6,4 +6,4 @@
 # Executed by xdm/gdm/kdm at login
 #
 
-/bin/bash --login -i ~/.xinitrc
+exec bash --login -i ~/.xinitrc
diff --git a/.config/bash/logout.sh b/.config/bash/logout.sh
index de4f5f7..5dd8f7d 100644
--- a/.config/bash/logout.sh
+++ b/.config/bash/logout.sh
@@ -1,7 +1,4 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
+# ~/.bash_logout: sourced by bash(1) when login shell exits.
 
-# when leaving the console clear the screen to increase privacy
-
-if [ "$SHLVL" = 1 ]; then
-    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
-fi
+# Clear the screen for privacy's sake.
+clear
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index fabe70e..f570a1a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,4 +1,5 @@
-;; This config requires Emacs 24(+?)
+;; This config requires Emacs 24.4(+?)
+;; Without (advice-add) it should work in older versions of Emacs 24.
 ;;;; Use XDG-ish locations ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (setq xdg-cache-home (file-name-as-directory (or (getenv "XDG_CACHE_HOME") "~/.cache")))
 (setq
@@ -128,6 +129,8 @@
 ;; Misc. crap
 
 (when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
+(setq inhibit-startup-screen t)
+(setq-default truncate-lines t)
 
 (defun align-regexp--use-spaces (orig-fun &rest args)
   "Use spaces for alignment"
diff --git a/.config/login.d/01_xdg.sh b/.config/login.d/01_xdg.sh
index 2e0b42c..07cea90 100644
--- a/.config/login.d/01_xdg.sh
+++ b/.config/login.d/01_xdg.sh
@@ -20,16 +20,15 @@ fi
 if [[ -z $XDG_RUNTIME_DIR ]] && type flock &>/dev/null; then
 	_diy_xdg_runtime_login() {
 		export XDG_RUNTIME_DIR="$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME"
-		readonly XDG_RUNTIME_DIR
 		# There's a race condition here, between the `ln -s` and `flock`.
 		# But it's not like I'll be hammering a box with logins.
-		if [[ ! -d "$XDG_CACHE_HOME" ]]; then
-			local tmp="$(mktemp --tmpdir -- "${USER}@${HOSTNAME}-runtime.XXXXXXXXXX")"
+		if [[ ! -d "$XDG_RUNTIME_DIR" ]]; then
+			local tmp="$(mktemp -d --tmpdir -- "${USER}@${HOSTNAME}-runtime.XXXXXXXXXX")"
 			mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir"
 			ln -sfT -- "$tmp" "$XDG_RUNTIME_DIR"
 		fi
 		if ! [[ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/.lock" ]]; then
-			exec 7 >"$XDG_CACHE_HOME/xdg-runtime-dir/.lock"
+			exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock"
 		fi
 		if flock -sn 7; then
 			trap _diy_xdg_runtime_logout EXIT
diff --git a/.config/symlinks b/.config/symlinks
index 030954c..37a7267 100644
--- a/.config/symlinks
+++ b/.config/symlinks
@@ -8,6 +8,7 @@
 .config/X11/clientrc	.xinitrc
 .config/X11/serverrc	.xserverrc
 .config/X11/login	.xsession
+.config/login.sh	.xprofile
 
 # Bash
 .config/bash/rc.sh	.bashrc
-- 
cgit v1.2.3-54-g00ecf