update

7 files changed, 35 insertions, 9 deletions

diff --git a/.bashrc b/.bashrc
index 2c5b611..119e071 100644
--- a/.bashrc
+++ b/.bashrc
@@ -99,3 +99,15 @@ fi
 if [ -f "$HOME/.login-daemons" ]; then
     . "$HOME/.login-daemons"
 fi
+
+if [ -f "${HOME}/.gnupg/agent-info" ]; then
+    .   "${HOME}/.gnupg/agent-info"
+    export GPG_AGENT_INFO
+    #export SSH_AUTH_SOCK
+fi
+
+export PERL_LOCAL_LIB_ROOT="/home/luke/perl5";
+export PERL_MB_OPT="--install_base /home/luke/perl5";
+export PERL_MM_OPT="INSTALL_BASE=/home/luke/perl5";
+export PERL5LIB="/home/luke/perl5/lib/perl5/i686-linux-thread-multi:/home/luke/perl5/lib/perl5";
+export PATH="/home/luke/perl5/bin:$PATH";
diff --git a/.git.info.exclude b/.git.info.exclude
index 34e552f..29ead42 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -14,6 +14,8 @@
 # Ignore these for privacy
 .ssh/*
 !.ssh/config
+.gnupg/*
+!.gnupg/gpg.conf
 .netrc
 .gnupg/*
 
@@ -67,6 +69,7 @@ history.*
 .pulse-cookie
 .pki
 .alsa.save
+.gnash-media
 
 # Ignore files that are autogenerated
 .folders
@@ -79,6 +82,4 @@ history.*
 .offlineimap
 .crontab.local
 .xmodmap
-.elmo
-.ido.last
 .bogofilter/*
diff --git a/.login-daemons b/.login-daemons
index 1d76e9d..2ec181c 100644
--- a/.login-daemons
+++ b/.login-daemons
@@ -4,4 +4,6 @@ if [ -x "`which daemon`" ]; then
     daemon emacs --daemon
     daemon sysfiles
     daemon maildirproc
+    daemon gpg-agent --daemon --write-env-file "${HOME}/.gnupg/agent-info"
+    daemon batterymon 20 "alsactl --file $HOME/.alsa.full restore; espeak 'PLUG ME IN'"
 fi
diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc
index 15ea01c..cbb3e18 100644
--- a/.maildirproc/default.rc
+++ b/.maildirproc/default.rc
@@ -6,10 +6,17 @@ processor.maildir_base = "~/Maildir"
 processor.auto_reload_rcfile = True
 
 def is_to_or_from(mail,address):
+	"""
+	Return true if [mail] is to or from an address that contains [address].
+	"""
 	return (
 		mail["From"].contains(address)
 		or mail.target.contains(address))
 def is_to_or_from_re(mail,address):
+	"""
+	Return true if [mail] is to or from an address that matches the
+	regex [address].
+	"""
 	return (
 		mail["From"].matches(address)
 		or mail.target.matches(address))
@@ -87,10 +94,8 @@ def my_filters(mail):
 
 	if (
 		False
-		or mail["List-ID"].matches( "dev.list.parabolagnulinux.org")
-		or is_to_or_from(mail,      "dev@list.parabolagnulinux.org")
-		or mail["List-ID"].matches("dev.lists.parabolagnulinux.org")
-		or is_to_or_from(mail,     "dev@lists.parabolagnulinux.org")
+		or mail["List-ID"].matches( "parabolagnulinux.org")
+		or is_to_or_from(mail,      "parabolagnulinux.org")
 		):
 		mail.move(".software.parabola-dev")
 		return
@@ -248,6 +253,7 @@ def my_filters(mail):
 	if (
 		False
 		or mail["From"].contains("@msdlt.k12.in.us")
+		or mail["From"].contains("naviance.com")
 		or is_to_or_from(mail,"ibwhite@comcast.net")
 		or mail["Subject"].contains("IOA")
 		or mail["From"].contains("nths.org")
diff --git a/.profile b/.profile
index 499af90..811b4bf 100644
--- a/.profile
+++ b/.profile
@@ -37,6 +37,8 @@ if [ -f "$HOME/.selected_editor" ]; then
     export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
 fi
 
+export GPGKEY=D4FFBFC9
+
 if [ -f "$HOME/.login-daemons" ]; then
     . "$HOME/.login-daemons"
 fi
diff --git a/.wl b/.wl
index 63182f3..f28f6ed 100644
--- a/.wl
+++ b/.wl
@@ -63,13 +63,14 @@
     "^Organization:"
     "^Message-Id:"
     "^\\(Posted\\|Date\\):"
+    "^List-ID:"
     )
   wl-message-sort-field-list              ;; in this order
-  '("^From"
+  '("^Date"
+    "^From"
     "^Organization:"
     "^X-Attribution:"
     "^Subject"
-    "^Date"
     "^To"
     "^Cc")
   )
diff --git a/Makefile b/Makefile
index da553de..e04ff9f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ clean:
 	for file in $(NANO_SHARE)/*.nanorc; do echo "include \"$$file\""; done >> '$@'
 
 .folders: Maildir
-	find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@'|sort>'$@'
+	( echo '..'; find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@'
 
 .crontab.cookie: .crontab .crontab.local
 	cat $^ | crontab -
@@ -27,6 +27,8 @@ clean:
 	touch '$@'
 Maildir:
 	mkdir -p '$@'/{cur,new,tmp}
+Maildir/%: | Maildir
+	mkdir -p '$@'/{cur,new,tmp}
 
 commit:
 	git commit -a