Merge branch 'master' into build64-par/master

6 files changed, 47 insertions, 23 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 5f399a0..eddd0b7 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,4 +1,5 @@
 ;; This config requires Emacs 24.4(+?)
+;; Hey, Emacs: -*- Indent-tabs-mode: nil -*-
 ;; 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")))
@@ -88,12 +89,14 @@
   (:name dtrt-indent :type elpa ;; Detect indent style for existing files
    :after (dtrt-indent-mode 1))
   (:name page-break-lines :type elpa ;; Display form-feeds pretty
-   :before (advice-add 'page-break-lines-mode-maybe :override #'page-break-lines-mode)
+   :before (advice-add 'page-break-lines-mode-maybe
+                       :override #'page-break-lines-mode)
    :after (global-page-break-lines-mode 1))
   (:name smart-tabs-mode :type elpa ;; Indent with tabs, align with spaces
    :after (progn
            (smart-tabs-mode 1)
-	   (apply 'smart-tabs-insinuate (mapcar 'car smart-tabs-insinuate-alist))))
+           (apply 'smart-tabs-insinuate
+                  (mapcar 'car smart-tabs-insinuate-alist))))
   ;; Major modes
   (:name bison-mode :type elpa)
   (:name coffee-mode :type elpa
@@ -112,23 +115,28 @@
   ))
 ;; What packages el-get should install, both from above, and it's
 ;; internal list of sources.
-(el-get 'sync '(el-get
+(el-get 'sync (append
+  '(el-get)
   ;; Minor modes
-  dtrt-indent
-  page-break-lines
-  smart-tabs-mode
+  '(dtrt-indent
+    page-break-lines
+    smart-tabs-mode
+    )
   ;; Major modes
-  ;;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
-  php-mode-improved
-  scss-mode
-  ))
+  (if (file-exists-p "~/Maildir") ; wanderlust is huge, only use on emailing boxes
+      '(apel flim semi wanderlust)
+    '())
+  '(
+    ;;nxhtml ; nxhtml is invasive, only enable if actively using
+    bison-mode
+    coffee-mode
+    graphviz-dot-mode
+    haml-mode
+    markdown-mode
+    nginx-mode
+    php-mode-improved
+    scss-mode
+    )))
 
 
 ;; Misc. crap
diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc
index 6b31260..7ee5f42 100644
--- a/.config/maildirproc/att.rc
+++ b/.config/maildirproc/att.rc
@@ -7,7 +7,6 @@ import datetime
 
 processor.maildir_base = "~/Maildir"
 processor.auto_reload_rcfile = True
-processor.logfile = os.getenv('XDG_CACHE_HOME', "~/.cache")+"/maildirproc/att.log"
 
 def is_to_or_from(mail,address):
 	"""
@@ -77,8 +76,10 @@ def handle_incoming_unknown(mail):
 		or is_to_or_from(mail, "parabola.nu")
 		or is_to_or_from(mail, "parabolagnulinux.org")
 		or mail["From"] == "MAILER-DAEMON@yahoo.com"
+		or mail["From"] == "3174451635@mms.att.net"
 		or mail["From"].contains("@facebookmail.com>")
 		or mail["From"].contains("@gandi.net")
+		or mail["From"].contains("@github.com>")
 		or mail["From"].contains("@goodwillindy.org>")
 		or mail["From"].contains("@lpi.org>")
 		or mail["From"].contains("@msdlt.k12.in.us>")
@@ -86,6 +87,7 @@ def handle_incoming_unknown(mail):
 		or mail["From"].contains("@post.oreilly.com>")
 		or mail["From"].contains("@scouting.org>")
 		or mail["From"].contains("@wolframalpha.com>")
+		or mail["From"].contains("margieshu@sbcglobal.net")
 		or mail["From"].contains("parabolagnulinux.org")
 		or mail["List-Id"].matches(".*\.(gnu|gnome|archlinux|parabolagnulinuxlibre)\.org")
 		or mail["List-Id"].matches(".*\.parabola\.nu")
@@ -287,6 +289,10 @@ def my_filters(mail):
 			move_ham(mail,".School.Robotics")
 			return
 
+	if mail["Subject"].contains("[Quizroom]"):
+		move_ham(mail,".School.CS408")
+		return
+
 	# Sort mail from software people
 	for address in [
 		"@archlinux.org",
@@ -301,6 +307,7 @@ def my_filters(mail):
 		"@gnu.org",
 		"@ietf.org",
 		"@kde.org",
+		"@nongnu.org",
 		"@sourceforge.com",
 		"@thyrsus.com",
 		"trustees@core3.amsl.com",
diff --git a/.config/maildirproc/purdue.rc b/.config/maildirproc/purdue.rc
index b1f64af..d1505f9 100644
--- a/.config/maildirproc/purdue.rc
+++ b/.config/maildirproc/purdue.rc
@@ -5,7 +5,6 @@ import subprocess
 
 processor.maildir_base = "~/Maildir.purdue"
 processor.auto_reload_rcfile = True
-processor.logfile = os.getenv('XDG_CACHE_HOME', "~/.cache")+"/maildirproc/purdue.log"
 
 def is_to_or_from(mail,address):
 	"""
@@ -104,6 +103,10 @@ def my_filters(mail):
 		mail.move("INBOX.work.2013.Comcast")
 		return
 
+	if is_to_or_from(mail,"@Cartus.com"):
+		mail.move("INBOX.work.2015.qualcomm")
+		return
+
 	if (
 		False
 		or mail["Subject"].contains("[CS Opportunity Update]")
@@ -265,10 +268,13 @@ def my_filters(mail):
 		return
 	# CS448 (Databases)
 	if piazza_topic(mail, "CS 44800"):
-		mail.move("INBOX.classes.2015.1.CS448")
+		mail.move("INBOX.classes.2015-1.CS448")
 		return
 	# ME297 (FRC)
-	if mail["Subject"].contains("[ME297]"):
+	if (False
+		or mail["Subject"].contains("[ME297]")
+		or is_to_or_from(mail, "heller5@purdue.edu")
+		):
 		mail.move("INBOX.classes.2015-1.ME297")
 		return
 	# SOC324 (Criminology)
diff --git a/.config/offlineimaprc b/.config/offlineimaprc
index 36b382c..4b3d4e3 100644
--- a/.config/offlineimaprc
+++ b/.config/offlineimaprc
@@ -17,7 +17,7 @@ folderfilter = lambda folder: folder in [ 'Inbox', 'Bulk Mail' ]
 [Repository Remote-SBCGlobal]
 type = IMAP
 ssl = yes
-cert_fingerprint = 9751f610c2631b3d4e63afcd096e5eb94c1f6fc8
+cert_fingerprint = a920541d377a4249259bcc59846a1faf621b4287
 remotehost = imap.mail.yahoo.com
 remoteuser = lukeshu@sbcglobal.net
 folderfilter = lambda folder: folder in [ 'Inbox', 'Bulk Mail' ]
diff --git a/.config/systemd/user/maildirproc@.service b/.config/systemd/user/maildirproc@.service
index bdca746..9c4181c 100644
--- a/.config/systemd/user/maildirproc@.service
+++ b/.config/systemd/user/maildirproc@.service
@@ -3,7 +3,7 @@ Description=maildirproc mail filter
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/maildirproc -r ${HOME}/.config/maildirproc/%I.rc
+ExecStart=/usr/bin/maildirproc --rcfile=${HOME}/.config/maildirproc/%I.rc --logfile=-
 Restart=on-failure
 
 [Install]
diff --git a/.local/bin/config-path b/.local/bin/config-path
index 1d4d4d1..e81a986 100755
--- a/.local/bin/config-path
+++ b/.local/bin/config-path
@@ -43,6 +43,9 @@ var_done() {
 }
 
 main() {
+	export LC_ALL=C # Work around brokenly slow Unicode handling
+			# in Bash
+
 	IFS=:
 	# Import existing values
 	var_init PATH