From af7fca016ab0e83c129147f8102dc8ee893571a8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 19 Jul 2014 18:06:08 -0400 Subject: get changes from build64-par --- .config/Makefile | 4 +- .config/cron/make-config | 2 +- .config/emacs/custom.el | 2 + .config/emacs/init.el | 6 +-- .config/emacs/wl.el | 12 ++--- .config/git/config | 2 +- .config/irbrc | 2 + .config/login.sh | 1 + .config/maildirproc/att.rc | 117 ++++++++++++++++++++++++++------------------- .config/offlineimaprc | 12 ++--- .config/selected_editor | 3 ++ .config/ssh/config | 22 +++++++-- .config/wmii-hg/wmiirc | 3 ++ .local/bin/x-pdf | 2 +- 14 files changed, 112 insertions(+), 78 deletions(-) diff --git a/.config/Makefile b/.config/Makefile index 829b820..dd4c37f 100644 --- a/.config/Makefile +++ b/.config/Makefile @@ -14,8 +14,8 @@ all: $(targets) clean: rm -f $(targets) -${HOME}/.folders: ${HOME}/Maildir - ( echo '..'; find $< -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@' +${HOME}/.folders: ${HOME}/Maildir $(MAKEFILE_LIST) + find $< -mindepth 2 -maxdepth 2 \( -type f -name "maildirfolder" -o -type d -name new -o -type d -name tmp -o -type d -name cur \) -printf '%P\0' | xargs -0 dirname -z -- | sort -zu | xargs -0 printf '.%s\n' >'$@' ${GITDIR}/info/exclude: ${HOME}/.git.info.exclude.in $(shell echo .??*/) ( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@ diff --git a/.config/cron/make-config b/.config/cron/make-config index 6e0fca9..9ac5ac2 100644 --- a/.config/cron/make-config +++ b/.config/cron/make-config @@ -1,2 +1,2 @@ -# m h dom mon dow command +#m h dom mon dow command */5 * * * * cronic bash -c '. $HOME/.local/lib/path.sh && . $HOME/.local/lib/xdg.sh && make -C $XDG_CONFIG_HOME' diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index 47bf654..e801e02 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -5,6 +5,7 @@ ;; If there is more than one, they won't work right. '(ansi-color-faces-vector [default bold shadow italic underline bold bold-italic bold]) '(ansi-color-names-vector (vector "#ffffff" "#ff9da4" "#d1f1a9" "#ffeead" "#bbdaff" "#ebbbff" "#99ffff" "#002451")) + '(asm-comment-char 35) '(custom-enabled-themes (quote (tango-dark))) '(custom-safe-themes (quote ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) '(erc-nick "lukeshu") @@ -25,6 +26,7 @@ '(sh-indent-comment t) '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com") '(smtpmail-smtp-service 587) + '(uniquify-buffer-name-style (quote post-forward-angle-brackets) nil (uniquify)) '(vc-annotate-background "#2b2b2b") '(vc-annotate-color-map (quote ((20 . "#bc8383") (40 . "#cc9393") (60 . "#dfaf8f") (80 . "#d0bf8f") (100 . "#e0cf9f") (120 . "#f0dfaf") (140 . "#5f7f5f") (160 . "#7f9f7f") (180 . "#8fb28f") (200 . "#9fc59f") (220 . "#afd8af") (240 . "#bfebbf") (260 . "#93e0e3") (280 . "#6ca0a3") (300 . "#7cb8bb") (320 . "#8cd0d3") (340 . "#94bff3") (360 . "#dc8cc3")))) '(vc-annotate-very-old-color "#dc8cc3") diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 2a7645f..11765b0 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -17,7 +17,7 @@ (eval-region (point) (point-max)) (kill-buffer (current-buffer))))) - ;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (unless (require 'package nil t) (eval-url "http://tromey.com/elpa/package-install.el")) @@ -59,6 +59,7 @@ ;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (require 'go-mode-load) +(require 'uniquify) (require 'mailcrypt) (mc-setversion "gpg") @@ -127,8 +128,7 @@ inhibit-startup-screen t line-number-mode t server-use-tcp t - server-mode t - show-paren-mode t) + server-mode t) (setq browse-url-generic-program (executable-find "v-www-browser") browse-url-browser-function 'browse-url-generic) diff --git a/.config/emacs/wl.el b/.config/emacs/wl.el index a169249..815c97c 100644 --- a/.config/emacs/wl.el +++ b/.config/emacs/wl.el @@ -27,12 +27,12 @@ ;; 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 "..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' - wl-queue-folder "..queue" ;; we don't use this + wl-fcc ".Sent" ;; sent msgs go to the "sent"-folder + wl-default-folder ".FOLDERS.Ham" ;; my main inbox + wl-draft-folder ".Draft" ;; store drafts in 'postponed' + wl-trash-folder ".Trash" ;; put trash in 'trash' + wl-spam-folder ".FOLDERS.Spam.training" ;; put spam in 'Bulk Mail' + wl-queue-folder ".FOLDERS.queue" ;; we don't use this ;; check this folder periodically, and update modeline ;wl-biff-check-folder-list '(".todo") ;; check every 180 seconds diff --git a/.config/git/config b/.config/git/config index 218b006..71c68f6 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,6 +1,6 @@ [user] name = Luke Shumaker - email = LukeShu@sbcglobal.net + email = lukeshu@sbcglobal.net [color] ui = auto [sendemail] diff --git a/.config/irbrc b/.config/irbrc index cda5ada..15d362a 100644 --- a/.config/irbrc +++ b/.config/irbrc @@ -1,5 +1,7 @@ # -*- mode: Ruby -*- require 'rubygems' unless defined? Gem # only needed in 1.8 require 'irb/ext/save-history' +require 'fileutils' IRB.conf[:SAVE_HISTORY] = 5000 IRB.conf[:HISTORY_FILE] = "#{ENV['XDG_CACHE_HOME']}/irb/history" +FileUtils.mkdir_p(File.dirname(IRB.conf[:HISTORY_FILE])) diff --git a/.config/login.sh b/.config/login.sh index e1650b2..392dc88 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -11,6 +11,7 @@ # the default umask is set in /etc/profile; for setting the umask # for ssh logins, install and configure the libpam-umask package. umask 022 +ulimit -c unlimited # save core dumps ## Paths ############################################################# diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc index 381ce8f..0252c74 100644 --- a/.config/maildirproc/att.rc +++ b/.config/maildirproc/att.rc @@ -46,7 +46,7 @@ def bogofilter_spam(mail): def handle_incoming_spam_training(mail): bogofilter_spam(mail) - mail.move(".Bulk Mail") + mail.move("FOLDERS.Spam") def handle_incoming_ham_training(mail): bogofilter_ham(mail) @@ -55,10 +55,26 @@ def handle_incoming_ham_training(mail): def handle_incoming_ham(mail): my_filters(mail) def handle_incoming_spam(mail): - mail.move(".Bulk Mail") + mail.move("FOLDERS.Spam") def handle_incoming_unknown(mail): # Filter spam + + if ( + False + or mail["Subject"].contains("[systemd-devel]") + or mail["Subject"].contains("[PATCH") + or mail["Subject"].contains("[Dev]") + or mail["Subject"].contains("[Maintenance]") + or is_to_or_from(mail, "gnu.org") + or is_to_or_from(mail, "fsf.org") + or mail["From"].contains("@parabola.nu") + or mail["From"].contains("parabolagnulinux.org") + or mail["From"].contains("@facebookmail.com>") + or mail["List-Id"].matches(".*\.(gnu|archlinux|parabolagnulinuxlibre)\.org") + ): + handle_incoming_ham_training(mail) + return spam = bogofilter_auto(mail) if spam == 0: @@ -68,10 +84,10 @@ def handle_incoming_unknown(mail): handle_incoming_ham(mail) return elif spam == 2: - # maybe spam + mail.move("Inbox") return else: - mail.move(".Error") + mail.move("FOLDERS.Error") return def my_filters(mail): @@ -82,7 +98,7 @@ def my_filters(mail): or mail["List-Id"].matches(list+"\.gnu\.org") or mail["Subject"].contains('['+list+']') ): - mail.move(".software."+list) + mail.move("FOLDERS.software."+list) return # Sort mail from other software mailing lists @@ -91,36 +107,36 @@ def my_filters(mail): or mail["List-Id"].matches("social-discuss\.gnu\.org") or mail["Subject"].contains("social-discuss") ): - mail.move(".software.social") + mail.move("FOLDERS.software.social") return if mail["List-Id"].matches("networkmanager-list\.gnome\.org"): - mail.move(".software.networkmanager") + mail.move("FOLDERS.software.networkmanager") return if mail["List-Id"].matches("maintenance.lists.parabolagnulinux.org"): if mail["From"].contains("monit@"): if mail["Message-Id"].contains("@repo.parabolagnulinux.org"): if mail["Subject"].matches("^\[Maintenance\] monit alert -- (Execution|Connection) (succeeded|failed) sshd$"): - mail.move(".software.parabola-maintenance.monit-repo.sshd") + mail.move("FOLDERS.software.parabola-maintenance.monit-repo.sshd") return - mail.move(".software.parabola-maintenance.monit-repo") + mail.move("FOLDERS.software.parabola-maintenance.monit-repo") return if mail["Message-Id"].contains("@rshg054.dnsready.net"): - mail.move(".software.parabola-maintenance.monit-rshg054") + mail.move("FOLDERS.software.parabola-maintenance.monit-rshg054") return if mail["Subject"].matches("Cron <.*@repo>"): - mail.move(".software.parabola-maintenance.cron-repo") + mail.move("FOLDERS.software.parabola-maintenance.cron-repo") return if mail["Subject"].matches("Cron <.*@rshg054>"): - mail.move(".software.parabola-maintenance.cron-rshg054") + mail.move("FOLDERS.software.parabola-maintenance.cron-rshg054") return - mail.move(".software.parabola-maintenance") + mail.move("FOLDERS.software.parabola-maintenance") return - if is_to_or_from(mail, "parabola.nu"): - mail.move(".software.parabola-labs") - return + #if is_to_or_from(mail, "parabola.nu"): + # mail.move("FOLDERS.software.parabola-labs") + # return if ( False @@ -129,29 +145,29 @@ def my_filters(mail): or is_to_or_from(mail, "kiwwwi.com.ar") ): if mail["Subject"].contains("[Django]"): - mail.move(".software.parabola-maintenance.django") + mail.move("FOLDERS.software.parabola-maintenance.django") return - mail.move(".software.parabola-dev") + mail.move("FOLDERS.software.parabola-dev") return if (mail["List-Id"].matches("pacman-dev.archlinux.org")): - mail.move(".software.pacman-dev") + mail.move("FOLDERS.software.pacman-dev") return - if (mail["List-Id"].matches("systemd-devel.lists.freedesktop.org")): - mail.move(".software.systemd-devel") + if (mail["List-Id"].matches("systemd-devel.lists.freedesktop.org") or is_to_or_from(mail, "systemd-devel@lists.freedesktop.org")): + mail.move("FOLDERS.software.systemd-devel") return for subject_re in [ "\[Stow-[^\]]*\].*", ]: if mail["Subject"].matches(subject_re): - mail.move(".software") + mail.move("FOLDERS.software") return # Sort mail from some social websites if mail["From"].matches("facebook(|mail)\.com"): - mail.move(".Social.Facebook") + mail.move("FOLDERS.Social.Facebook") return if ( @@ -159,15 +175,15 @@ def my_filters(mail): or mail["From"].matches("identi\.ca") or mail["From"].matches("statusnet") ): - mail.move(".Social.Identica") + mail.move("FOLDERS.Social.Identica") return if mail["From"].matches("twitter\.com"): - mail.move(".Social.Twitter") + mail.move("FOLDERS.Social.Twitter") return if mail["From"].matches("@xkcd\.com"): - mail.move(".Social.xkcd") + mail.move("FOLDERS.Social.xkcd") return # Sort mail related to Troop 276 @@ -191,12 +207,12 @@ def my_filters(mail): or is_to_or_from(mail,"mytroop.us") or is_to_or_from(mail,"crossroadsbsa.org") ): - mail.move(".Troop276") + mail.move("FOLDERS.BoyScouts") return # Sort mail from misc people if mail["From"].matches("margieshu@sbcglobal\.net"): - mail.move(".misc.Mom") + mail.move("FOLDERS.misc.Mom") return for address in [ @@ -206,7 +222,7 @@ def my_filters(mail): "jadparso@umail.iu.edu", ]: if is_to_or_from(mail,address): - mail.move(".misc.Jade") + mail.move("FOLDERS.misc.Jade") return for address in [ @@ -214,7 +230,7 @@ def my_filters(mail): "nintendo-news.com", ]: if mail["From"].contains(address): - mail.move(".misc.Nintendo") + mail.move("FOLDERS.misc.Nintendo") return for address in [ @@ -223,7 +239,7 @@ def my_filters(mail): "CompTIA", ]: if mail["From"].contains(address): - mail.move(".misc.CompTIA") + mail.move("FOLDERS.misc.CompTIA") return # Sort mail from FRC people @@ -248,7 +264,7 @@ def my_filters(mail): "william.walk@gmail.com", ]: if is_to_or_from(mail,address): - mail.move(".School.Robotics") + mail.move("FOLDERS.School.Robotics") return for subject_re in [ "robotics", @@ -256,7 +272,7 @@ def my_filters(mail): "kil-?a-?bytes", ]: if mail["Subject"].matches(subject_re): - mail.move(".School.Robotics") + mail.move("FOLDERS.School.Robotics") return # Sort mail from software people @@ -278,7 +294,7 @@ def my_filters(mail): "trustees@core3.amsl.com", ]: if is_to_or_from(mail,address): - mail.move(".software") + mail.move("FOLDERS.software") return @@ -288,16 +304,16 @@ def my_filters(mail): or is_to_or_from(mail, "@lnnorthstar.org") or is_to_or_from(mail, "lnnorthstar.org@tigertech.net") ): - mail.move(".School.Newspaper") + mail.move("FOLDERS.School.Newspaper") return # Sort mail from various employers/people who pay me if is_to_or_from(mail, "@precisepath.com"): - mail.move(".Work.PrecisePath") + mail.move("FOLDERS.Work.PrecisePath") return if is_to_or_from(mail,"susyphil@aol.com"): - mail.move(".Work.PMCH") + mail.move("FOLDERS.Work.PMCH") for address in [ "d.farrar@comcast.net", @@ -305,7 +321,7 @@ def my_filters(mail): "@vmware.com", ]: if is_to_or_from(mail,address): - mail.move(".Work.FAST") + mail.move("FOLDERS.Work.FAST") return # Sort misc newsletters @@ -319,12 +335,13 @@ def my_filters(mail): or mail["From"].contains("info@demandprogress.org") or (mail["From"].contains("@sparkfun.com") and mail["Message-Id"].contains("rsgsv.net")) ): - mail.move(".misc.Newsletters") + mail.move("FOLDERS.misc.Newsletters") return if ( False or mail["From"].contains("@msdlt.k12.in.us") + or mail["From"].contains("ltschoolfoundation@gmail.com") or mail["From"].contains("naviance.com") or is_to_or_from(mail,"ibwhite@comcast.net") or mail["Subject"].contains("IOA") @@ -334,7 +351,7 @@ def my_filters(mail): or mail["Subject"].contains("NHS") or mail["Subject"].contains("National Honor Society") ): - mail.move(".School") + mail.move("FOLDERS.School") return # from college stuff @@ -343,7 +360,7 @@ def my_filters(mail): or mail["Subject"].contains("NYLF") # National Youth Leadership Conference or mail["Subject"].contains("NSHSS") ): - mail.move(".College.Societies") + mail.move("FOLDERS.College.Societies") return if ( False @@ -356,11 +373,11 @@ def my_filters(mail): or mail["From"].contains("@dreamitdoitindiana.com") or mail["From"].contains("@indianatechinfo.org") ): - mail.move(".College") + mail.move("FOLDERS.College") return if mail["From"].contains("@projectwonderful.com"): - mail.move(".ProjectWonderful") + mail.move("FOLDERS.misc.ProjectWonderful") return if ( @@ -370,23 +387,23 @@ def my_filters(mail): or mail["From"].matches("@[^,>]*\.lukeshu\.ath\.cx") or mail["To"].matches("luke@") ): - mail.move(".LocalSystems") + mail.move("FOLDERS.LocalSystems") return if ( False or mail["Subject"].contains("password") or mail["Subject"].contains("account") ): - mail.move(".misc.accounts") + mail.move("FOLDERS.misc.accounts") return - mail.move(".Ham") + mail.move("FOLDERS.Ham") handle_mapping = { - ".": handle_incoming_unknown, - ".spam-training": handle_incoming_spam_training, - ".ham-training": handle_incoming_ham_training, - #".Ham": handle_incoming_ham, + "Inbox": handle_incoming_unknown, + "Bulk Mail": handle_incoming_unknown, + "FOLDERS.Spam.training": handle_incoming_spam_training, + "FOLDERS.Ham.training": handle_incoming_ham_training, } processor.maildirs = handle_mapping.keys() for mail in processor: diff --git a/.config/offlineimaprc b/.config/offlineimaprc index d027001..bdc2c66 100644 --- a/.config/offlineimaprc +++ b/.config/offlineimaprc @@ -12,21 +12,15 @@ remoterepository = Remote-SBCGlobal type = Maildir localfolders = ~/Maildir sep = . -folderfilter = lambda foldername: not re.search('(Trash|Del|-old|Draft)', foldername) -# transforms local -> remote -nametrans = lambda foldername: re.sub('^$', 'Inbox', re.sub('^'+re.escape('%(sep)s'), '', foldername)) +folderfilter = lambda folder: folder in [ 'Inbox' ] [Repository Remote-SBCGlobal] type = IMAP ssl = yes -cert_fingerprint = a6ee8d759eb76dafacffffc47c4507d51f444984 +cert_fingerprint = 9751f610c2631b3d4e63afcd096e5eb94c1f6fc8 remotehost = imap.mail.yahoo.com remoteuser = lukeshu@sbcglobal.net -folderfilter = lambda foldername: not re.search('(Trash|Del)', foldername) - -# transforms remote -> local -# we must assume that sep=/ on the remote IMAP server. -nametrans = lambda foldername: '/'+re.sub('^Inbox$', '', foldername) +folderfilter = lambda folder: folder in [ 'Inbox' ] ## Purdue ############################################################ diff --git a/.config/selected_editor b/.config/selected_editor index 7631487..eca2482 100644 --- a/.config/selected_editor +++ b/.config/selected_editor @@ -1,4 +1,7 @@ # Generated by /usr/bin/select-editor SELECTED_EDITOR="emacsclient -a '' -c" +if [[ -n $SSH_CONNECTION ]]; then + SELECTED_EDITOR+=' -nw' +fi ALTERNATE_EDITOR='nano' VISUAL="$SELECTED_EDITOR" diff --git a/.config/ssh/config b/.config/ssh/config index 9b366ed..2a5b79a 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -4,21 +4,33 @@ Host * ControlPath ~/.runtime/ssh-%r@%h:%p Compression yes +# Purdue ################################################### + Host lore HostName lore.cs.purdue.edu - User shumakl - Host data HostName data.cs.purdue.edu +Host *.cs.purdue.edu User shumakl +# Parabola ################################################# + +# short names Host repo - Port 1863 HostName repo.parabolagnulinux.org +Host wiki + HostName wiki.parabolagnulinux.org +Host projects + HostName projects.parabolagnulinux.org +Host parabola + HostName parabolagnulinux.org -Host rshg054 +Host *.parabolagnulinux.org parabolagnulinux.org *.parabola.nu parabola.nu Port 1863 - HostName parabolagnulinux.org + User lukeshu + +# Personal ################################################# Host lukeshu.com Port 1863 + User lukeshu diff --git a/.config/wmii-hg/wmiirc b/.config/wmii-hg/wmiirc index a6bc4b4..a7dd80c 100755 --- a/.config/wmii-hg/wmiirc +++ b/.config/wmii-hg/wmiirc @@ -1,4 +1,7 @@ #!/bin/bash +unset WMII_NAMESPACE +unset WMII_DIR + export _PATH="$PATH" export PATH="$WMII_CONFPATH:$PATH" diff --git a/.local/bin/x-pdf b/.local/bin/x-pdf index 1b23a3d..3610fde 100755 --- a/.local/bin/x-pdf +++ b/.local/bin/x-pdf @@ -1,4 +1,4 @@ #!/bin/sh -`pick evince okular xpdf` "$@" +`pick zathura mupdf okular evince xpdf` "$@" exit $? -- cgit v1.2.3-2-g168b