Merge branch 'master' of git://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.bashrc
	.profile

6 files changed, 78 insertions, 39 deletions

diff --git a/.bashrc b/.bashrc
index b299ed2..e6a949e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -96,12 +96,7 @@ if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
 
-if [ "$TERM" != dumb ]; then
-    if [ -d "$HOME/tmp" ]; then
-        export TMPDIR="$HOME/tmp"
-    fi
-    daemon emacs --daemon
-    daemon sysfiles
-    daemon maildirproc
+if [ -f "$HOME/.login-daemons" ]; then
+    . "$HOME/.login-daemons"
 fi
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
diff --git a/.login-daemons b/.login-daemons
new file mode 100644
index 0000000..1d76e9d
--- /dev/null
+++ b/.login-daemons
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -x "`which daemon`" ]; then
+    daemon emacs --daemon
+    daemon sysfiles
+    daemon maildirproc
+fi
diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc
index feee8d4..7ea1ef0 100644
--- a/.maildirproc/default.rc
+++ b/.maildirproc/default.rc
@@ -84,6 +84,10 @@ def my_filters(mail):
 	if mail["List-Id"].matches("social(|-discuss)\.gnu\.org"):
 		mail.move(".software.social")
 		return
+
+	if mail["List-ID"].matches("dev.lists.parabolagnulinux.org"):
+		mail.move(".software.parabola-dev")
+		return
 	
 	# Sort email from some social websites
 	
@@ -147,6 +151,7 @@ def my_filters(mail):
 		"tswilson4801@att.net",
 		"justicejade10@aol.com",
 		"silioso@gmail.com",
+		"cdewalt3@yahoo.com",
 		]:
 		if is_to_or_from(mail,address):
 			mail.move(".School.Robotics")
diff --git a/.profile b/.profile
index 6e42583..0bb55ca 100644
--- a/.profile
+++ b/.profile
@@ -22,12 +22,10 @@ for dir in $HOME/.prefix/lib; do
     fi
 done
 
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-        . "$HOME/.bashrc"
-    fi
+if [ -d "$HOME/tmp" ]; then
+    export TMPDIR="$HOME/tmp"
+elif [ -d "$HOME/.prefix/tmp"]; then
+    export TMPDIR="$HOME/.prefix/tmp"
 fi
 
 # set SELECTED_EDITOR, EDITOR, and VISUAL to set the text editor used
@@ -39,6 +37,18 @@ if [ -f "$HOME/.selected_editor" ]; then
     export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
 fi
 
+if [ -f "$HOME/.login-daemons" ]; then
+    . "$HOME/.login-daemons"
+fi
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+        . "$HOME/.bashrc"
+    fi
+fi
+
 if [ -x "`which alsactl`" ]; then
     alsactl --file $HOME/.alsa.save restore &> /dev/null || true
 fi
diff --git a/.wl b/.wl
index c6bf63c..63182f3 100644
--- a/.wl
+++ b/.wl
@@ -1,29 +1,33 @@
 ;; mode:-*-emacs-lisp-*-
 
-;; wanderlust 
-(setq 
-  elmo-maildir-folder-path "~/Maildir"          ;; where I store my mail
+(setq user-mail-address "lukeshu@sbcglobal.net")
 
-  wl-stay-folder-window t                       ;; show the folder pane (left)
-  wl-folder-window-width 35                     ;; toggle on/off with 'i'
-
-  wl-local-domain "lukeshu.ath.cx"
+;; wanderlust 
+(setq
+  ;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  wl-local-domain "lukeshu.ath.cx"  
+  wl-icon-directory "~/.emacs.d/el-get/wanderlust/icons"
   
+  ;; Network ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; This only deals with sending--I use offlineimap to fetch
   wl-draft-send-mail-function 'wl-draft-send-mail-with-smtp
-  wl-smtp-connection-type (quote ssl)
-  wl-smtp-authenticate-type "login"
-  wl-smtp-posting-server "plus.smtp.mail.yahoo.com"
-  wl-smtp-posting-port   465
-  wl-smtp-posting-user   "lukeshu@sbcglobal.net"
-  wl-message-id-domain   "lukeshu@sbcglobal.net"    ;; put a unique identifier here
-  wl-from "Luke Shumaker <lukeshu@sbcglobal.net>"   ;; my From:
+  ;; The following settings are Yahoo!'s SMTP servers:
+  wl-smtp-connection-type   (quote ssl)
+  wl-smtp-authenticate-type "login"                         
+  wl-smtp-posting-server    "plus.smtp.mail.yahoo.com"
+  wl-smtp-posting-port      465
+  wl-smtp-posting-user      user-mail-address
+  wl-message-id-domain      user-mail-address
 
-  wl-fcc-force-as-read t               ;; mark sent messages as read 
+  ;; Folders/File system ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  elmo-msgdb-directory "~/.emacs.d/elmo"        ;; where elmo keeps all its stuff
+  elmo-cache-directory "~/.emacs.d/elmo-cache"  ;; where elmo keeps all its stuff
+  elmo-maildir-folder-path "~/Maildir"          ;; where I store my mail
 
   ;; note: all below are dirs (Maildirs) under elmo-maildir-folder-path 
   ;; the '.'-prefix is for marking them as maildirs
   wl-fcc            "..Sent"       ;; sent msgs go to the "sent"-folder
-  wl-default-folder "..Inbox"      ;; my main inbox 
+  wl-default-folder "..Ham"        ;; my main inbox 
   wl-draft-folder   "..Draft"      ;; store drafts in 'postponed'
   wl-trash-folder   "..Trash"      ;; put trash in 'trash'
   wl-spam-folder    "..Bulk Mail"  ;; put spam in 'Bulk Mail'
@@ -33,11 +37,26 @@
   ;wl-biff-check-folder-list '(".todo") ;; check every 180 seconds
                                        ;; (default: wl-biff-check-interval)
 
-  wl-folder-hierarchy-access-folders '(".*")
+  ;wl-folder-hierarchy-access-folders '("\.*")
+  wl-folder-hierarchy-access-folders '(
+    "^.\\([^/.]+[/.]\\)*[^/.]+\\(:\\|@\\|$\\)"
+    "^-[^.]*\\(:\\|@\\|$\\)"
+    "^@$"
+    "^'$")
+
+  ;; Writing
+  wl-from (concat user-full-name " <" user-mail-address ">") ;; From: line  
+  ;;wl-organization "Foo Corp"
+  wl-fcc-force-as-read t                        ;; mark sent messages as read
+  mime-edit-split-message nil                   ;; don't split long messages
 
-  ;; hide many fields from message buffers
-  wl-message-ignored-field-list '("^.*:")
-  wl-message-visible-field-list
+  ;; Reading ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  wl-stay-folder-window t                       ;; show the folder pane (left)
+  wl-folder-window-width 35                     ;; 
+  wl-message-auto-reassemble-message/partial t  ;; reasemble split messages
+  
+  wl-message-ignored-field-list '("^.*:") ;; default to hiding all headers
+  wl-message-visible-field-list           ;; but then display these
   '("^\\(To\\|Cc\\):"
     "^Subject:"
     "^\\(From\\|Reply-To\\):"
@@ -45,11 +64,12 @@
     "^Message-Id:"
     "^\\(Posted\\|Date\\):"
     )
-  wl-message-sort-field-list
+  wl-message-sort-field-list              ;; in this order
   '("^From"
     "^Organization:"
     "^X-Attribution:"
-     "^Subject"
-     "^Date"
-     "^To"
-     "^Cc"))
+    "^Subject"
+    "^Date"
+    "^To"
+    "^Cc")
+  )
diff --git a/Makefile b/Makefile
index 3fb2243..da553de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,15 @@
 CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/
 NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK)))))
 
+ALSACTL=$(firstword $(shell which alsactl) echo)
+
 targets=.nanorc .folders .crontab.cookie .alsa.save
 all: $(targets)
 clean:
 	rm -f $(targets)
 
 .alsa.save: FORCE
-	alsactl --file $(HOME)/.alsa.save store || touch '$@'
+	$(ALSACTL) --file $(HOME)/.alsa.save store || touch '$@'
 
 .nanorc: .nanorc.in $(NANO_SHARE)
 	cat '$<' > '$@'