Merge remote-tracking branch 'origin/master' into build64-par/master

6 files changed, 38 insertions, 17 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 26eb2ae..d81ac98 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -9,6 +9,26 @@
     ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
  '(erc-nick "lukeshu")
  '(explicit-shell-file-name "/bin/bash")
+ '(org-latex-default-packages-alist
+   (quote
+    (("" "fontspec" t)
+     ("" "fixltx2e" nil)
+     ("" "graphicx" t)
+     ("" "longtable" nil)
+     ("" "float" nil)
+     ("" "wrapfig" nil)
+     ("" "rotating" nil)
+     ("normalem" "ulem" t)
+     ("" "amsmath" t)
+     ("" "textcomp" t)
+     ("" "marvosym" t)
+     ("" "wasysym" t)
+     ("" "amssymb" t)
+     ("" "hyperref" nil)
+     "\\tolerance=1000")))
+ '(org-latex-pdf-process
+   (quote
+    ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f")))
  '(scroll-bar-mode nil)
  '(send-mail-function (quote smtpmail-send-it))
  '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com")
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 5429c08..5f399a0 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -95,6 +95,7 @@
            (smart-tabs-mode 1)
 	   (apply 'smart-tabs-insinuate (mapcar 'car smart-tabs-insinuate-alist))))
   ;; Major modes
+  (:name bison-mode :type elpa)
   (:name coffee-mode :type elpa
    :after (add-hook 'coffee-mode-hook
                     '(lambda ()
@@ -102,6 +103,7 @@
                        (set (make-local-variable 'indent-tabs-mode) nil)
                        )))
   (:name graphviz-dot-mode :type elpa)
+  (:name haml-mode :type elpa)
   (:name markdown-mode :type elpa
    :after (add-to-list 'auto-mode-alist '("\\.ronn\\'" . markdown-mode)))
   (:name nginx-mode :type elpa
@@ -113,15 +115,19 @@
 (el-get 'sync '(el-get
   ;; Minor modes
   dtrt-indent
-  smart-tabs-mode
   page-break-lines
+  smart-tabs-mode
   ;; Major modes
-  apel flim semi wanderlust
+  ;;apel flim semi wanderlust ; wanderlust is huge, only use on emailing boxes
+  ;;nxhtml ; nxhtml is invasive, only enable if actively using
+  bison-mode
+  coffee-mode
   graphviz-dot-mode
+  haml-mode
   markdown-mode
   nginx-mode
-  ;;nxhtml ; nxhtml is invasive, only enable if actively using
   php-mode-improved
+  scss-mode
   ))
 
 
diff --git a/.config/ssh/config b/.config/ssh/config
index 07240a6..cc796ed 100644
--- a/.config/ssh/config
+++ b/.config/ssh/config
@@ -6,10 +6,8 @@ Host *
 
 # Purdue ###################################################
 
-Host lore
-	HostName lore.cs.purdue.edu
-Host data
-	HostName data.cs.purdue.edu
+Host data lore borg* xinu* sac* sslab*
+	HostName %h.cs.purdue.edu
 Host *.cs.purdue.edu
 	User shumakl
 
@@ -25,16 +23,14 @@ Host lukeshu.com
 	Port 1863
 	User lukeshu
 
+Match host build64-par exec "host %n.lan."
+	HostName build64-par
+	Port 22
+	ForwardX11 yes
+	ForwardX11Trusted yes
 Host build64-par
 	User luke
-
 	HostName lukeshu.com
 	Port 1864
 	ForwardX11 no
 	ForwardX11Trusted no
-
-	Match host %h.lan.
-	HostName build64-par
-	Port 22
-	ForwardX11 yes
-	ForwardX11Trusted yes
diff --git a/.config/wmii-hg/config.sh b/.config/wmii-hg/config.sh
index 64596a8..ac0a349 100644
--- a/.config/wmii-hg/config.sh
+++ b/.config/wmii-hg/config.sh
@@ -52,6 +52,7 @@ Event() {
 			done < <(lstags)
 			;;
 		WmiircQuit) ## No args
+			trap - EXIT
 			echo ' ==> Stopping wmiirc'
 			exit;;
 		WmiircMount) ## No args
diff --git a/.config/wmii-hg/rbar_wifi b/.config/wmii-hg/rbar_wifi
index 195df7c..eaf0137 100755
--- a/.config/wmii-hg/rbar_wifi
+++ b/.config/wmii-hg/rbar_wifi
@@ -38,6 +38,7 @@ right-click() {
 		fi
 	done
 
+	IFS=$' \t\n'
 	item=$(wmii9menu -i "$cur" "${list[@]}")
 	case "$item" in
 	'')
diff --git a/.config/wmii-hg/rules b/.config/wmii-hg/rules
index 3576983..6334a7c 100644
--- a/.config/wmii-hg/rules
+++ b/.config/wmii-hg/rules
@@ -1,8 +1,5 @@
 /wimenu/ floating=always
 /panel/ tags=/.*/ floating=always
-/xfce4-notifyd/ tags=/.*/ floating=always
-
-/nm-applet/ floating=off
 
 /^FLTK:FLTK:/ floating=always