Fix merge issues

7 files changed, 8 insertions, 18 deletions

diff --git a/.config/.gitignore b/.config/.gitignore
index 829cfee..93fc6dc 100644
--- a/.config/.gitignore
+++ b/.config/.gitignore
@@ -19,3 +19,6 @@
 /libreoffice/
 /netbeans/
 /transmission/
+
+# It's on the CS boxes, and I sometimes accidentally click it
+/chromium/
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index ba22862..e4208b5 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -9,13 +9,6 @@
     ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
  '(erc-nick "lukeshu")
  '(explicit-shell-file-name "/bin/bash")
- '(global-whitespace-mode nil)
- '(inhibit-startup-screen t)
- '(mdmua-maildir "~/Maildir")
- '(minibuffer-prompt-properties
-   (quote
-    (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)))
- '(page-break-lines-char 45)
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
  '(safe-local-variable-values
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index c2c5604..f8f19e0 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -41,7 +41,6 @@
 ;;;; Early settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; This isn't particularly important, but set it before doing a whole
 ;; lot (loading packages), so there isn't a weird change in text size.
-(setq notify-method 'notify-via-libnotify)
 (set-face-attribute 'default nil :height 80)
 
 
@@ -216,9 +215,6 @@ sh-script.el is broken."
  ediff-split-window-function 'split-window-horizontally
  )
 
-(set-default 'truncate-lines t)
-(setq inhibit-startup-screen t)
-
 ;; Automatically load smerge mode for merge files
 (defun try-smerge-mode ()
   (save-excursion
diff --git a/.config/login.d/90_dot-runtime.sh b/.config/login.d/90_dot-runtime.sh
index fb7ecd6..d06568f 100644
--- a/.config/login.d/90_dot-runtime.sh
+++ b/.config/login.d/90_dot-runtime.sh
@@ -1,2 +1,4 @@
+# This is really only needed for ssh ControlPath; as I don't have a
+# way to communicate XDG_RUNTIME_DIR to it otherwise.
 mkdir -p -- ~/.runtime
 ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime/"$HOSTNAME"
diff --git a/.config/login.sh b/.config/login.sh
index 353861a..c09f15c 100644
--- a/.config/login.sh
+++ b/.config/login.sh
@@ -1,4 +1,5 @@
-# ~/.profile: executed by the command interpreter for login shells.
+#!/bin/bash
+# ~/.profile: sourced by the command interpreter for login shells.
 # I like that graphical login scripts be configured to load this, so
 # it always runs, graphical or not.
 #
diff --git a/.config/wmii-hg/rbar_acpi b/.config/wmii-hg/rbar_acpi
index bdcdf0f..5e77abb 100755
--- a/.config/wmii-hg/rbar_acpi
+++ b/.config/wmii-hg/rbar_acpi
@@ -5,7 +5,7 @@ update() {
 	setup_trap "${id}.*"
 
 	while true; do
-		acpi -bt | sed -r \
+		acpi -t | sed -r \
 			       -e 's/^([A-Z])[a-z]+ ([0-9]+):/\1\2:/' \
 			       -e 's/\s*degrees\s*/°/g' |
 		    cat -n | while read -r n line; do
diff --git a/.git.info.exclude.in b/.git.info.exclude.in
index 44bcbd3..2d09032 100644
--- a/.git.info.exclude.in
+++ b/.git.info.exclude.in
@@ -45,8 +45,3 @@ lock
 *~
 .#*
 \#*#
-/.prefix*/
-/.local/share/gvfs-metadata/
-/.local/share/Trash/
-/.config/chromium/
-/.config/dconf/