From e328e6bf6f1f30be59297d2b49947adf6ff10d2c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 27 Feb 2016 20:15:26 -0500 Subject: It's 2016 --- .config/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/Makefile b/.config/Makefile index 002a933..5274756 100644 --- a/.config/Makefile +++ b/.config/Makefile @@ -21,7 +21,7 @@ clean: .PHONY: all clean ${HOME}/.folders: ${HOME}/Maildir $(MAKEFILE_LIST) - find -L $< -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 -r0 dirname -z -- | sort -zu | xargs -0 printf -- '.%s\n' | grep -vP '^\.FOLDERS.Ham.20(?!15)' > '$@' + find -L $< -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 -r0 dirname -z -- | sort -zu | xargs -0 printf -- '.%s\n' | grep -vP '^\.FOLDERS.Ham.20(?!1[56])' > '$@' ${GIT_DIR}/info/exclude: ${HOME}/.git.info.exclude.in $(shell echo .??*/) ( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@ -- cgit v1.2.3 From 3f3fbd746fe00652e9438a94954ab062304e892b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 27 Feb 2016 20:16:59 -0500 Subject: bash: add a colored chardiff alias --- .config/bash/rc.d/10_aliases.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.config/bash/rc.d/10_aliases.sh b/.config/bash/rc.d/10_aliases.sh index 03ece7e..1b25f93 100644 --- a/.config/bash/rc.d/10_aliases.sh +++ b/.config/bash/rc.d/10_aliases.sh @@ -24,7 +24,7 @@ if [ -x "`which dircolors`" ]; then if [[ -t 1 ]]; then local red="$(tput setaf 1)" local blue="$(tput setaf 4)" - local bold="$(tput bold)" + local bold="$(tput bold)" local reset="$(tput sgr0)" command wdiff \ -w "$bold$red[-" \ @@ -36,6 +36,22 @@ if [ -x "`which dircolors`" ]; then fi } + chardiff() { + if [[ -t 1 ]]; then + local red="$(tput setaf 1)" + local blue="$(tput setaf 4)" + local bold="$(tput bold)" + local reset="$(tput sgr0)" + command chardiff \ + -w "$bold$red[-" \ + -x "-]$reset" \ + -y "$bold$blue{+" \ + -z "+}$reset" "$@" + else + command chardiff "$@" + fi + } + diff() { if [[ -t 1 ]]; then ( -- cgit v1.2.3 From e76068f0dacf0146fe58144abbca6f923743210b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 27 Feb 2016 20:17:46 -0500 Subject: updated email stuff --- .config/maildirproc/att.rc | 3 ++ .config/maildirproc/purdue.rc | 94 ++++++++++++++++++++++++++++++------------- .config/offlineimaprc | 14 +++++-- 3 files changed, 79 insertions(+), 32 deletions(-) diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc index 397ffcf..4532bec 100644 --- a/.config/maildirproc/att.rc +++ b/.config/maildirproc/att.rc @@ -9,6 +9,8 @@ import re processor.maildir_base = "~/Maildir" processor.auto_reload_rcfile = True +# FIXME: this doesn't handle the case where someone replies `To` you +# directly an `Cc`s the list. def mailman_domain(mail, domain): """ Return a string that is the list-name for a mailman domain @@ -342,6 +344,7 @@ def my_filters(mail): "@ietf.org", "@kde.org", "@lists.fedorahosted.org", + "@mozilla.org", "@nongnu.org", "@sourceforge.com", "@thyrsus.com", diff --git a/.config/maildirproc/purdue.rc b/.config/maildirproc/purdue.rc index 06f349b..952e356 100644 --- a/.config/maildirproc/purdue.rc +++ b/.config/maildirproc/purdue.rc @@ -83,6 +83,7 @@ def my_filters(mail): or is_to_or_from(mail, "rentpayment.com") or is_to_or_from(mail, "@vectren.com") or is_to_or_from(mail, "@vectrenemail.com") + or is_to_or_from(mail, "@apartments247.com") ): mail.move("INBOX.housing.BeauJardin") return @@ -135,7 +136,7 @@ def my_filters(mail): mail.move("INBOX.POSIX") return - if mail["From"].contains("build@travis-ci.org"): + if mail["From"].contains("builds@travis-ci.org"): mail.move("INBOX.crap.TravisCI") return @@ -306,42 +307,77 @@ def my_filters(mail): # mail.move("INBOX.classes.2015-1.SOC324") # return - # Spring 2015 ###############################z########################## + # # Fall 2015 ############################################################ - # CHM 490 (History & Philosophy of Science) - if is_to_or_from(mail, "gmbodner@purdue.edu"): - mail.move("INBOX.classes.2015-2.CHM490") - return - # CS 334 (Graphics) + # # CHM 490 (History & Philosophy of Science) + # if is_to_or_from(mail, "gmbodner@purdue.edu"): + # mail.move("INBOX.classes.2015-2.CHM490") + # return + # # CS 334 (Graphics) + # if ( + # False + # or mail["Subject"].contains("fall-2015-cs-33400-le1") + # or is_to_or_from(mail, "aliaga@purdue.edu") + # or is_to_or_from(mail, "abejara@purdue.edu") + # ): + # mail.move("INBOX.classes.2015-2.CS334") + # return + # if piazza_topic(mail, "CS 334"): + # mail.move("INBOX.classes.2015-2.CS334.Piazza") + # return + # # CS 490 (Senior Project) + # if is_to_or_from(mail, "anesen@purdue.edu"): + # mail.move("INBOX.classes.2015-2.CS490") + # return + # if piazza_topic(mail, "CS 49000"): + # mail.move("INBOX.classes.2015-2.CS490.Piazza") + # return + # # MA 416 (Probability) + # if mail["Subject"].contains("fall-2015-ma-41600"): + # mail.move("INBOX.classes.2015-2.MA416") + # return + # if piazza_topic(mail, "SELLKE 416 "): + # mail.move("INBOX.classes.2015-2.MA416.Piazza") + # return + + # # FRC 4272 + # if mail["Subject"].contains("[ME297]"): + # mail.move("INBOX.classes.2015-2.FRC4272") + # return + + # Spring 2016 ########################################################## + + # CS 422 (Networking) if ( False - or mail["Subject"].contains("fall-2015-cs-33400-le1") - or is_to_or_from(mail, "aliaga@purdue.edu") - or is_to_or_from(mail, "abejara@purdue.edu") + or mail["Subject"].contains("spring-2016-cs-42200") + or is_to_or_from(mail, "rkarandi@cs.purdue.edu") ): - mail.move("INBOX.classes.2015-2.CS334") - return - if piazza_topic(mail, "CS 334"): - mail.move("INBOX.classes.2015-2.CS334.Piazza") - return - # CS 490 (Senior Project) - if is_to_or_from(mail, "anesen@purdue.edu"): - mail.move("INBOX.classes.2015-2.CS490") + mail.move("INBOX.classes.2016-1.CS422") return - if piazza_topic(mail, "CS 49000"): - mail.move("INBOX.classes.2015-2.CS490.Piazza") + # CS 456 (Programming Languages) + if piazza_topic(mail, "CS 456"): + mail.move("INBOX.classes.2016-1.CS456.Piazza") return - # MA 416 (Probability) - if mail["Subject"].contains("fall-2015-ma-41600"): - mail.move("INBOX.classes.2015-2.MA416") - return - if piazza_topic(mail, "SELLKE 416 "): - mail.move("INBOX.classes.2015-2.MA416.Piazza") + # VFS 491 (Mafia in the Movies) + if ( + False + or mail["Subject"].contains("spring-2016-fvs-49100") + or is_to_or_from(mail, "lawton@purdue.edu") + ): + mail.move("INBOX.classes.2016-1.FVS491") return - # FRC 4272 - if mail["Subject"].contains("[ME297]"): - mail.move("INBOX.classes.2015-2.FRC4272") + if ( + False + or mail["Subject"].contains("[ME297]") + or is_to_or_from(mail, "firstteam4272@gmail.com") + or is_to_or_from(mail, "@tscstudents.net") + or is_to_or_from(mail, "abenyeho@purdue.edu") + or is_to_or_from(mail, "Henry65@purdue.edu") + or is_to_or_from(mail, "chang282@purdue.edu") + ): + mail.move("INBOX.classes.2016-1.FRC4272") return # Everything else ##################################################### diff --git a/.config/offlineimaprc b/.config/offlineimaprc index 4b3d4e3..c1390c5 100644 --- a/.config/offlineimaprc +++ b/.config/offlineimaprc @@ -17,7 +17,7 @@ folderfilter = lambda folder: folder in [ 'Inbox', 'Bulk Mail' ] [Repository Remote-SBCGlobal] type = IMAP ssl = yes -cert_fingerprint = a920541d377a4249259bcc59846a1faf621b4287 +sslcacertfile = /etc/ssl/certs/ca-certificates.crt remotehost = imap.mail.yahoo.com remoteuser = lukeshu@sbcglobal.net folderfilter = lambda folder: folder in [ 'Inbox', 'Bulk Mail' ] @@ -26,7 +26,7 @@ folderfilter = lambda folder: folder in [ 'Inbox', 'Bulk Mail' ] [Account Purdue] localrepository = Local-Purdue -remoterepository = Remote-Purdue +remoterepository = Remote-PurdueMS [Repository Local-Purdue] type = Maildir @@ -34,10 +34,18 @@ localfolders = ~/Maildir.purdue sep = . folderfilter = lambda foldername: re.search('INBOX', foldername) -[Repository Remote-Purdue] +[Repository Remote-PurdueMyMail] type = IMAP ssl = yes cert_fingerprint = 2189e7d568d93352fcdccaa24137856191703c4a remotehost = mymail.purdue.edu remoteuser = shumakl folderfilter = lambda foldername: re.search('INBOX', foldername) + +[Repository Remote-PurdueMS] +type = IMAP +ssl = yes +remotehost = outlook.office365.com +remoteuser = shumakl@purdue.edu +folderfilter = lambda foldername: re.search('INBOX', foldername) +sslcacertfile = /etc/ssl/certs/ca-certificates.crt -- cgit v1.2.3 From 7d9303fc9264af65a1ae9b0073a822e0a2fffe35 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 27 Feb 2016 20:18:18 -0500 Subject: systemd: gracefully kill vncserver --- .config/systemd/user/vncserver@.service | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service index 2b5b453..2cabf4f 100644 --- a/.config/systemd/user/vncserver@.service +++ b/.config/systemd/user/vncserver@.service @@ -7,6 +7,7 @@ Type=simple Restart=always ExecStart=/usr/bin/env vncserver -fg %I +ExecStop=/usr/bin/env vncserver -kill %I ExecStopPost=/bin/rm /tmp/.X%I-lock /tmp/.X11-unix/X%I [Install] -- cgit v1.2.3