Update various things

9 files changed, 106 insertions, 65 deletions

diff --git a/.config/.gitignore b/.config/.gitignore
index 03b31b2..4b6a38f 100644
--- a/.config/.gitignore
+++ b/.config/.gitignore
@@ -1,11 +1,14 @@
-# Ignore things I don't care enough about to track
-vlc
-Trolltech.conf
+/RecentDocuments
 
-RecentDocuments
+# Ignore things I don't care enough about to track
+/Kitware/ # some 3d graphics toolkit
+/Trolltech.conf
+/colors/ # KDE color picker
+/dconf/user # binary, tracking it isn't helpful
+/vlc/
 
 # Ignore these files that if I tracked them, would be a separate repo
-libreoffice
-transmission
-gimp-*
-netbeans
+/libreoffice/
+/transmission/
+/gimp-*/
+/netbeans/
diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini
new file mode 100644
index 0000000..7cb92de
--- /dev/null
+++ b/.config/gtk-2.0/gtkfilechooser.ini
@@ -0,0 +1,12 @@
+[Filechooser Settings]
+LastFolderUri=file:///home/luke
+LocationMode=filename-entry
+ShowHidden=false
+ShowSizeColumn=true
+GeometryX=287
+GeometryY=99
+GeometryWidth=792
+GeometryHeight=585
+SortColumn=name
+SortOrder=ascending
+StartupMode=recent
diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
new file mode 100644
index 0000000..85af107
--- /dev/null
+++ b/.config/gtk-3.0/bookmarks
@@ -0,0 +1,5 @@
+file:///home/luke/Documents
+file:///home/luke/Music
+file:///home/luke/Pictures
+file:///home/luke/Videos
+file:///home/luke/Downloads
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 5c3cf6a..b0443ec 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,17 +1,16 @@
-[Settings]
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-gtk-theme-name = oxygen-gtk
-gtk-icon-theme-name = default.kde4
-gtk-font-name = Sans 10
-gtk-cursor-theme-name = Vanilla-DMZ
-gtk-cursor-theme-size = 0
-gtk-toolbar-style = GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size = GTK_ICON_SIZE_SMALL_TOOLBAR
-gtk-button-images = 0
-gtk-menu-images = 1
-gtk-enable-event-sounds = 1
-gtk-enable-input-feedback-sounds = 1
-gtk-xft-antialias = 1
-gtk-xft-hinting = 1
-gtk-xft-hintstyle = hintfull
-gtk-xft-rgba = rgb
+[Settings] 
+gtk-theme-name=Raleigh
+gtk-icon-theme-name=oxygen
+gtk-font-name=Sans 10
+gtk-cursor-theme-name=Vanilla-DMZ
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=1
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintfull
+gtk-xft-rgba=rgb
diff --git a/.config/lxpanel/default/panels/panel b/.config/lxpanel/default/panels/panel
index 9d776bb..e89a833 100644
--- a/.config/lxpanel/default/panels/panel
+++ b/.config/lxpanel/default/panels/panel
@@ -25,6 +25,26 @@ Global {
 }
 
 Plugin {
+    type = menu
+    Config {
+        image=/usr/share/lxpanel/images/my-computer.png
+        system {
+        }
+        separator {
+        }
+        item {
+            command=run
+        }
+        separator {
+        }
+        item {
+            image=gnome-logout
+            command=logout
+        }
+    }
+}
+
+Plugin {
     type = space
     expand=1
     Config {
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index bf07464..39ee122 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="oxygen-gtk"
-gtk-icon-theme-name="default.kde4"
+gtk-theme-name="Raleigh"
+gtk-icon-theme-name="oxygen"
 gtk-font-name="Sans 10"
 gtk-cursor-theme-name="Vanilla-DMZ"
 gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
 gtk-button-images=0
 gtk-menu-images=1
diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc
index cbdc908..ecea80f 100644
--- a/.maildirproc/default.rc
+++ b/.maildirproc/default.rc
@@ -74,7 +74,7 @@ def handle_incoming_unknown(mail):
 
 def my_filters(mail):
 	# Sort mail from GNU mailing lists
-	for list in [ 'bug-gsrc', 'bug-make', 'help-make', 'social', 'help-grub' ]:
+	for list in [ 'bug-gsrc', 'bug-make', 'help-make', 'social', 'help-grub', 'bug-gnuzilla' ]:
 		if (
 			False
 			or mail["List-Id"].matches(list+"\.gnu\.org")
diff --git a/.maildirproc/purdue.rc b/.maildirproc/purdue.rc
index 546b792..9a759f5 100644
--- a/.maildirproc/purdue.rc
+++ b/.maildirproc/purdue.rc
@@ -20,36 +20,27 @@ def is_to_or_from_re(mail,address):
 	return (
 		mail["From"].matches(address)
 		or mail.target.matches(address))
-	
-def handle_incoming_ham(mail):
-	my_filters(mail)
 
-def handle_incoming_unknown(mail):
-	# Filter spam
+def piazza_topic(mail, topic):
+	return (
+		is_to_or_from(mail, topic+" on Piazza")
+		or mail["Subject"].contains(topic+" on Piazza"))
 	
-	spam = bogofilter_auto(mail)
-	if spam == 0:
-		handle_incoming_spam(mail)
-		return
-	elif spam == 1:
-		handle_incoming_ham(mail)
-		return
-	elif spam == 2:
-		# maybe spam
-		return
-	else:
-		mail.move(".Error")
-		return
-
 def my_filters(mail):
+	# Generic stuff ########################################################
+
 	if mail["Subject"].contains("[PASE]"):
 		mail.move("INBOX.PASE")
 		return
+
 	if mail["Subject"].contains("[PLUG]"):
 		mail.move("INBOX.PLUG")
 		return
-	if mail["Subject"].contains("Fall-2012-SCI-21000-001:"):
-		mail.move("INBOX.classes.SCI210")
+
+	if is_to_or_from(mail,"linkedin.com"):
+		mail.move("INBOX.LinkedIn")
+		return
+
 	if (
 		False
 		or mail["Subject"].contains("[CS Opportunity Update]")
@@ -57,25 +48,36 @@ def my_filters(mail):
 		):
 		mail.move("INBOX.CS")
 		return
-	if is_to_or_from(mail,"linkedin.com"):
-		mail.move("INBOX.LinkedIn")
-		return
+
+	# Fall 2012 ############################################################
+
+	if mail["Subject"].contains("Fall-2012-SCI-21000-001:"):
+		mail.move("INBOX.classes.2012-2.SCI210")
 	if mail["Subject"].contains("fall-2012-cs-18000"):
-		mail.move("INBOX.classes.CS180")
+		mail.move("INBOX.classes.2012-2.CS180")
 		return
-	if (
-		False
-		or is_to_or_from(mail,"CS 18000 on Piazza")
-		or mail["Subject"].contains("CS 18000 on Piazza")
-		):
-		mail.move("INBOX.classes.CS180.Piazza")
+	if piazza_topic(mail, "CS 18000"):
+		mail.move("INBOX.classes.2012-2.CS180.Piazza")
 		return
 	if mail["Subject"].contains("Fall-2012-SOC-10000"):
-		mail.move("INBOX.classes.SOC100")
+		mail.move("INBOX.classes.2012-2.SOC100")
+		return
+
+	# Spring 2013 ##########################################################
+
+	if mail["Subject"].contains("[CS240]") or mail["Subject"].contains("Spring-2013-CS-24000"):
+		mail.move("INBOX.classes.2013-1.CS240")
+		return
+	if piazza_topic(mail, "CS 240"):
+		mail.move("INBOX.classes.2013-1.CS240.Piazza")
+		return
+
+	if mail["Subject"].contains("Spring-2013-CS-18200"):
+		mail.move("INBOX.classes.2013-1.CS182")
 		return
 
 handle_mapping = {
-	"INBOX":           handle_incoming_ham,
+	"INBOX":           my_filters,
 	}
 processor.maildirs = handle_mapping.keys()
 for mail in processor:
diff --git a/.selected_editor b/.selected_editor
index 81a95de..7631487 100644
--- a/.selected_editor
+++ b/.selected_editor
@@ -1,4 +1,4 @@
 # Generated by /usr/bin/select-editor
-SELECTED_EDITOR="emacsclient -a ''"
-ALTERNATE_EDITOR="$SELECTED_EDITOR -c"
-VISUAL="$SELECTED_EDITOR -c"
+SELECTED_EDITOR="emacsclient -a '' -c"
+ALTERNATE_EDITOR='nano'
+VISUAL="$SELECTED_EDITOR"