diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-04 10:50:55 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-04 10:50:55 -0400 |
| commit | 10f53560cac77820fecafcb7c9343fc2c9a67db4 (patch) | |
| tree | 1546b21da07c1dd9dcb5ef892dcb474efd67ebd5 | |
| parent | 74e11a21ec9e941c16dcfafb1e7aa5ef5dd4abb9 (diff) | |
| parent | c9e73feae3f2f452cbca92193cc297276b36d59f (diff) | |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
| -rw-r--r-- | .emacs | 3 | ||||
| -rw-r--r-- | .emacs.d/custom.el | 1 | ||||
| -rw-r--r-- | .git.info.exclude | 33 | ||||
| -rw-r--r-- | .gitconfig | 5 | ||||
| -rw-r--r-- | .login-daemons | 2 | ||||
| -rw-r--r-- | .maildirproc/default.rc | 7 | ||||
| -rwxr-xr-x | .wmii/wmiirc | 5 |
7 files changed, 40 insertions, 16 deletions
@@ -43,9 +43,10 @@ (setq my-el-get-packages '(el-get ; nxhtml + apel flim semi wanderlust smarttabs )) - + ;; Now load all of that ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ELPA diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index ee82309..5a3e67f 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -9,6 +9,7 @@ '(explicit-shell-file-name "/bin/bash") '(inhibit-startup-screen t) '(mdmua-maildir "~/Maildir") + '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt))) '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) '(scroll-bar-mode nil)) diff --git a/.git.info.exclude b/.git.info.exclude index 9b65125..3e57f50 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -28,36 +28,44 @@ # Ignore temp/log/history files *.log log* -*cache* + *.tmp *.tmp.* tmp.* tmp-* tmp -*.lock -*.state -*~ -.#* -\#*# -.~lock.*# + *_history *_hist history.* -*authority +history + +*.lock +.~lock.*# +lock + +*.state *.cookie *.bak +*authority +*cache* + +# Ignore files left by editors +*~ +.#* +\#*# + + # Ignore these special-purpose cache/temp files .camel_certs .compiz/session/* .config/chromium/Default/History\ Index* .current.asound .dbus/session-bus/* -.ddd/history .ddd/sessions .dvdcss .esd_auth -.eshell/history .evolution/.* .gconfd/saved_state .gnash-media @@ -68,7 +76,7 @@ history.* .kde4/share/apps/okular/docdata/* .kde4/socket-* .lesshst -.links2/links.his +.link*/*.his .local/share/Trash/* .local/share/gvfs-metadata/* .local/share/icons/* @@ -76,10 +84,13 @@ history.* .pki .pulse .pulse-cookie +.recently-used .recently-used.xbel* +.setroubleshoot .shotwell/thumbs/* .sudo_as_admin_successful .thumbnails/* +.wireshark/recent* .xsession-errors* # Ignore files that are autogenerated @@ -3,3 +3,8 @@ email = LukeShu@sbcglobal.net [color] ui = auto +[sendemail] + smtpencryption = ssl + smtpserver = plus.smtp.mail.yahoo.com + smtpuser = lukeshu@sbcglobal.net + smtpserverport = 465 diff --git a/.login-daemons b/.login-daemons index 380b3f1..bf8cf21 100644 --- a/.login-daemons +++ b/.login-daemons @@ -1,8 +1,6 @@ #!/bin/sh 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 " diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 24f51e8..a323e5e 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -102,6 +102,10 @@ def my_filters(mail): mail.move(".software.parabola-dev") return + if (mail["List-Id"].matches("pacman-dev@archlinux.org")): + mail.move(".software.pacman-dev") + return + for subject_re in [ "\[Stow-[^\]]*\].*", ]: @@ -148,6 +152,7 @@ def my_filters(mail): or is_to_or_from(mail,"eldredmac@comcast.net")# MacDonell or is_to_or_from(mail,"mitchprather@sbcglobal.net") or is_to_or_from(mail,"oa_wap@yahoo.com") + or is_to_or_from(mail,"mytroop.us") ): mail.move(".Troop276") return @@ -221,6 +226,8 @@ def my_filters(mail): "canonical.org", "foocorp.net", "cnuk.org", + "@archlinux.org", + "@github.com", ]: if is_to_or_from(mail,address): mail.move(".software") diff --git a/.wmii/wmiirc b/.wmii/wmiirc index 82c424b..92adb8b 100755 --- a/.wmii/wmiirc +++ b/.wmii/wmiirc @@ -47,7 +47,8 @@ Event() { # might complain about /etc/mtab if the x server has already stopped fusermount -u "$WMII_DIR" 2>>/dev/null echo " -> rmdir'ing WMII_DIR=$WMII_DIR..." - rmdir "$WMII_DIR";; + rmdir "$WMII_DIR" + exit;; Warning) ## $@=string notify-send "wmii warning: $*";; Key) ## $1=keystroke @@ -226,7 +227,7 @@ Key() { sel=$(sed 1q $WMII_DIR/client/sel/ctl) { tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return - wmiir xwrite /client/$sel/tags $tag + wmiir xwrite /client/$sel/tags "$tag" }& ;; esac } ## End Key |