From 86b1a11dfcbab990a07a236f41deefe0aaf4ed5e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Mar 2014 17:30:22 -0400 Subject: post-merge clean --- .config/X11/clientrc | 20 +++--- .config/bash/rc.d/emacs.sh | 43 +++++++++++-- .config/bash/rc.sh | 150 ++++++++++++++++++------------------------- .config/cron/.crontab | 0 .config/cron/.crontab.local | 0 .config/emacs/.gitignore | 1 - .config/emacs/init.el | 6 +- .config/irbrc | 3 + .config/login.local.sh | 6 -- .config/login.sh | 106 ++++++++++++++++++++---------- .config/maildirproc/att.rc | 102 ++++++++++++++++++++--------- .config/offlineimaprc | 38 ++++++++--- .config/ssh/authorized_keys | 1 + .config/ssh/known_hosts | 8 +++ .config/wmii-hg/autostart | 2 - .config/wmii-hg/include.sh | 71 ++------------------ .config/wmii-hg/quit | 4 +- .config/wmii-hg/rbar_battery | 7 +- .config/wmii-hg/rbar_clock | 7 +- .config/wmii-hg/rbar_cpu | 9 ++- .config/wmii-hg/rbar_wifi | 7 +- 21 files changed, 318 insertions(+), 273 deletions(-) delete mode 100644 .config/cron/.crontab delete mode 100644 .config/cron/.crontab.local delete mode 100644 .config/login.local.sh create mode 100644 .config/ssh/authorized_keys create mode 100644 .config/ssh/known_hosts diff --git a/.config/X11/clientrc b/.config/X11/clientrc index 9c5ce55..c261324 100644 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -5,22 +5,22 @@ # Executed by startx (run your window manager from here) if [ -d /etc/X11/xinit/xinitrc.d ]; then - echo ' ==> Running scripts in Entering xinitrc.d/*' - for f in /etc/X11/xinit/xinitrc.d/*; do - echo " -> $f" - [ -x "$f" ] && "$f" & - done - unset f - echo ' -> done' + echo ' ==> Running scripts in Entering xinitrc.d/*' + for f in /etc/X11/xinit/xinitrc.d/*; do + echo " -> $f" + [ -x "$f" ] && "$f" & + done + unset f + echo ' -> done' fi -usermodmap="$HOME/.xmodmap" +usermodmap="$XDG_CONFIG_HOME/X11/modmap" if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" + xmodmap "$usermodmap" fi # exec gnome-session # exec startkde # exec startxfce4 # ...or the Window Manager of your choice -exec ck-launch-session wmii +exec wmii diff --git a/.config/bash/rc.d/emacs.sh b/.config/bash/rc.d/emacs.sh index f484bbb..9c1bf4d 100644 --- a/.config/bash/rc.d/emacs.sh +++ b/.config/bash/rc.d/emacs.sh @@ -1,8 +1,41 @@ +#!/bin/bash + case "$TERM" in eterm*) - SELECTED_EDITOR='emacsclient' - EDITOR=$SELECTED_EDITOR - VISUAL=$SELECTED_EDITOR - export SELECTED_EDITOR EDITOR VISUAL - :;; + SELECTED_EDITOR='emacsclient' + EDITOR=$SELECTED_EDITOR + VISUAL=$SELECTED_EDITOR + export SELECTED_EDITOR EDITOR VISUAL + # The following uses the variable _EMACS_BUFFER to store some state + _emacs_quote() { + local str="$*" + str="${str//\\/\\\\}" + str="${str//\"/\\\"}" + str="\"${str}\"" + printf '%s' "$str" + } + _emacs_rename_terminal() { + local name="$(_emacs_quote "$(_emacs_get_desired_buffer_name)")" + if [[ -n $_EMACS_BUFFER ]]; then + local buffer="(get-buffer $_EMACS_BUFFER)" + else + local buffer='(window-buffer (selected-window))' + fi + _EMACS_BUFFER="$(emacsclient -e "(with-current-buffer ${buffer} (rename-buffer ${name} t)))" 2>/dev/null)" + } + _emacs_get_short_cwd() { + local base=$1 + local suffix='' + if [[ $base =~ (/(src|pkg|doc|pkg-libre|src-libre|trunk|tags|branches))*$ ]]; then + suffix=$BASH_REMATCH + base=${base%$suffix} + fi + base=${base##*/} + echo ${base}${suffix} + } + _emacs_get_desired_buffer_name() { + echo "*ansi-term*<$(_emacs_get_short_cwd "$PWD")>" + } + PROMPT_COMMAND='_emacs_rename_terminal "$(_emacs_get_desired_buffer_name)"' + :;; esac diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh index ed5d87e..1661b35 100644 --- a/.config/bash/rc.sh +++ b/.config/bash/rc.sh @@ -1,4 +1,4 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. +# ~/.bashrc: executed by bash(1) for interactive non-login shells. # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) # for examples @@ -6,112 +6,86 @@ # they are login shells or not. # If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -# don't overwrite GNU Midnight Commander's setting of `ignorespace'. -export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups -# ... or force ignoredups and ignorespace -export HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# Let ** recursively scan directories -shopt -s globstar +[[ $- != *i* ]] && return # Why is this not on by default? # "We have a cached value, but it isn't valid anymore. Should we trash it?" +# "Duh, yes!" shopt -s checkhash -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -case "$TERM" in - xterm) export TERM=xterm-256color;; -esac +################################################################################ -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - linux) color_prompt=yes;; - *-*color*) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then +# History settings +# don't put duplicate lines in the history. See bash(1) for more options +# don't overwrite GNU Midnight Commander's setting of `ignorespace'. +HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups +HISTFILE=${XDG_CACHE_HOME}/bash/history +HISTTIMEFORMAT='[%Y-%m-%d %H:%M] ' +HISTSIZE=5000 +shopt -s histappend # append to the history file, don't overwrite it +mkdir -p "${HISTFILE%/*}" + +# General settings +shopt -s checkwinsize # update the values of LINES and COLUMNS +shopt -s globstar # Let ** recursively scan directories + +################################################################################ +# Overly complicated setting of PS1 # +################################################################################ + +# Belongs in aliases, but I use it here +term-title() { + local fmt='' + case "$TERM" in + screen|tmux) fmt='\ek%s\e\\';; + xterm*|rxvt*) fmt='\e]0;%s\a';; + esac + printf "$fmt" "$*" +} +PROMPT_COMMAND='' + +make_prompt() { + echo "${BOLD}${GREEN}\u@\h${BLUE}:\w${RESET}" +} + +if tput setaf 1 &>/dev/null; then # We have color support; assume it's compliant with Ecma-48 # (ISO/IEC-6429). (Lack of such support is extremely rare, and such # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\n\$ ' + RESET="$(tput sgr0)" + BOLD="$(tput bold)" + RED="$(tput setaf 1)" + GREEN="$(tput setaf 2)" + BLUE="$(tput setaf 4)" + + _STATUS="${BOLD}[" + _STATUS+="\$(v=\$?; [[ \$v = 0 ]] && c='${GREEN}' || c='${RED}'; printf %s%03i \$c \$v)" + _STATUS+="${RESET}${BOLD}]${RESET}" else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\n\$ ' + _STATUS='[$(printf "%03i" $?)]' fi -unset color_prompt force_color_prompt +PS1="${_STATUS} $(make_prompt)"'\n\$ ' +unset RESET BOLD RED GREEN BLUE _STATUS +PS1="$(term-title $(make_prompt))$PS1" +unset make_prompt -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac +################################################################################ -# Include modular config files -if [ -d ~/.bash.d ]; then - for file in ~/.bash.d/*.sh; do - . $file; - done +# Load my aliases +if [[ -f ${XDG_CONFIG_HOME}/bash/aliases.sh ]]; then + . ${XDG_CONFIG_HOME}/bash/aliases.sh fi -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases +# Include modular config files +if [[ -d ${XDG_CONFIG_HOME}/bash/rc.d ]]; then + for file in "${XDG_CONFIG_HOME}/bash/rc.d"/*.sh; do + . "$file" + done fi # enable programmable completion features (you don't need to enable # this, if it's already enabled in /etc/bash.bashrc and /etc/profile # sources /etc/bash.bashrc). if [ -f /etc/bash_completion ]; then - . /etc/bash_completion + . /etc/bash_completion 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/.config/cron/.crontab b/.config/cron/.crontab deleted file mode 100644 index e69de29..0000000 diff --git a/.config/cron/.crontab.local b/.config/cron/.crontab.local deleted file mode 100644 index e69de29..0000000 diff --git a/.config/emacs/.gitignore b/.config/emacs/.gitignore index 0b3a0d4..ef4ec20 100644 --- a/.config/emacs/.gitignore +++ b/.config/emacs/.gitignore @@ -7,4 +7,3 @@ server/* session.* tramp url/* -saves diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 2a7645f..836a53c 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -58,10 +58,10 @@ ;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require 'go-mode-load) +;(require 'go-mode-load) -(require 'mailcrypt) -(mc-setversion "gpg") +;(require 'mailcrypt) +;(mc-setversion "gpg") (add-hook 'wl-summary-mode-hook 'mc-install-read-mode) (add-hook 'wl-mail-setup-hook 'mc-install-write-mode) diff --git a/.config/irbrc b/.config/irbrc index 7596d96..b1029a6 100644 --- a/.config/irbrc +++ b/.config/irbrc @@ -1 +1,4 @@ require 'rubygems' unless defined? Gem # only needed in 1.8 +require 'irb/ext/save-history' +IRB.conf[:SAVE_HISTORY] = 5000 +IRB.conf[:HISTORY_FILE] = "#{ENV['XDG_CACHE_HOME']}/irb/history" diff --git a/.config/login.local.sh b/.config/login.local.sh deleted file mode 100644 index 1da7aa7..0000000 --- a/.config/login.local.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -x "`which daemon`" ]; then - # daemon ... - : -fi diff --git a/.config/login.sh b/.config/login.sh index 377dc9b..4065baa 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -1,4 +1,9 @@ # ~/.profile: executed by the command interpreter for login shells. +# I like that graphical login scripts be configured to load this, so +# it always runs, graphical or not. +# +# This file should be executable by /bin/sh, but I'm going to assume bash(1) +# # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login # exists. @@ -8,60 +13,91 @@ umask 022 ## Paths ############################################################# -# Unix -bins=$(echo $HOME/bin $HOME/.local.`uname -m`/bin $HOME/.local/bin $HOME/.prefix.`uname -m`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) -for dir in $bins; do - if [ -d "$dir" ]; then - export PATH="$dir:$PATH" - fi -done - -# Ruby -for dir in $HOME/.prefix/lib; do - if [ -d "$dir" ]; then - export RUBYLIB="$dir" - fi -done +. "$HOME/.local/lib/path.sh" + +# TMPDIR ############################################################# + +if [[ ! -d "$HOME/tmp" ]]; then + tmp="$(mktemp --tmpdir -d "$USER-tmpdir.XXXXXXXXXXXXXXXXXXX")" + ln -sf "$tmp" "$HOME/tmp" + unset tmp +fi +export TMPDIR="$HOME/tmp" + +# XDG ################################################################ + +. "$HOME/.local/lib/xdg.sh" +ln -sf -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions # Settings ########################################################### +# Spell check +if [[ -z "$DICTIONARY" ]] && [[ -n "$LANG" ]]; then + export DICTIONARY="${LANG%%.*}" +fi + # Text editor -if [ -f "$HOME/.selected_editor" ]; then - . "$HOME/.selected_editor" - export SELECTED_EDITOR - export ALTERNATE_EDITOR - export EDITOR="${EDITOR:-$SELECTED_EDITOR}" - export VISUAL="${VISUAL:-$SELECTED_EDITOR}" +if [[ -f "$HOME/.selected_editor" ]]; then + . "$HOME/.selected_editor" + export SELECTED_EDITOR + export ALTERNATE_EDITOR + export EDITOR="${EDITOR:-$SELECTED_EDITOR}" + export VISUAL="${VISUAL:-$SELECTED_EDITOR}" fi # GPG -export GPGKEY=D4FFBFC9 +if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then + echo 'login: Setting GPGKEY' + export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` +fi +if [[ -z "$(pgrep -u `whoami` gpg-agent)" ]] && type gpg-agent &>/dev/null; then + echo 'login: Starting gpg-agent' + gpg-agent --daemon --write-env-file ~/.sessions/gpg >/dev/null +fi +if [[ -f ~/.sessions/gpg ]]; then + echo 'login: Setting gpg-agent info:' + cat ~/.sessions/gpg + . ~/.sessions/gpg + export GPG_AGENT_INFO + #export SSH_AUTH_SOCK +fi # Java _JAVA_OPTIONS='' _JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on' _JAVA_OPTIONS+=' -Dswing.aatext=true' _JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' -_JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" +if [[ -n $TMPDIR ]]; then + _JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" +fi export _JAVA_OPTIONS # X11 -if [ -z "$XAUTHORITY" ]; then - export XAUTHORITY=$HOME/.Xauthority +if [[ -z $XAUTHORITY ]]; then + export XAUTHORITY=$HOME/.Xauthority + #export XAUTHORITY=$HOME/.sessions/Xauthority fi -# Start background programs ########################################## -if [ -f "$HOME/.login-daemons" ]; then - . "$HOME/.login-daemons" -fi +# D-Bus +# if [[ -z $DBUS_SESSION_BUS_ADDRESS ]] && type dbus-launch &>/dev/null; then +# # I want a separate instance for each login +# #dbus-launch > "${HOME}/.cache/sessions/dbus" +# #. "${HOME}/.cache/sessions/dbus" +# eval `dbus-launch` -# BASH ############################################################### -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi +# export DBUS_SESSION_BUS_ADDRESS +# export DBUS_SESSION_BUS_PID +# fi + +# Load any box-specific stuff +if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then + . "$XDG_CONFIG_HOME/login.local.sh" fi -export PERL5LIB=/homes/shumakl/.prefix.x86_64/lib64/perl5:$PERL5LIB export GOROOT=/homes/shumakl/.prefix.x86_64/go +export PATH="/home/luke/perl5/bin:$PATH"; +export PERL5LIB="/home/luke/perl5/lib/perl5/i686-linux-thread-multi:/home/luke/perl5/lib/perl5"; +export PERL5LIB=/homes/shumakl/.prefix.x86_64/lib64/perl5:$PERL5LIB +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"; diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc index 71bc00c..381ce8f 100644 --- a/.config/maildirproc/att.rc +++ b/.config/maildirproc/att.rc @@ -1,16 +1,20 @@ -# -*- mode: python; -*- +# -*- mode: python; indent-tabs-mode: t -*- +import os import subprocess processor.maildir_base = "~/Maildir" processor.auto_reload_rcfile = True +processor.logfile = os.getenv('XDG_CACHE_HOME', "~/.cache")+"/maildirproc/att.log" 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) + False + or mail["From"].contains(address) + or mail["Reply-To"].contains(address) or mail.target.contains(address)) def is_to_or_from_re(mail,address): """ @@ -72,11 +76,11 @@ def handle_incoming_unknown(mail): def my_filters(mail): # Sort mail from GNU mailing lists - for list in [ 'bug-gsrc', 'bug-make', 'help-make', 'social', 'help-grub' ]: + for list in [ 'bug-gsrc', 'bug-make', 'help-make', 'social', 'help-grub', 'bug-gnuzilla', 'bug-librejs' ]: if ( False or mail["List-Id"].matches(list+"\.gnu\.org") - or mail["Subject"].contains(list) + or mail["Subject"].contains('['+list+']') ): mail.move(".software."+list) return @@ -90,15 +94,43 @@ def my_filters(mail): mail.move(".software.social") return + if mail["List-Id"].matches("networkmanager-list\.gnome\.org"): + mail.move(".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") + return + mail.move(".software.parabola-maintenance.monit-repo") + return + if mail["Message-Id"].contains("@rshg054.dnsready.net"): + mail.move(".software.parabola-maintenance.monit-rshg054") + return + if mail["Subject"].matches("Cron <.*@repo>"): + mail.move(".software.parabola-maintenance.cron-repo") + return + if mail["Subject"].matches("Cron <.*@rshg054>"): + mail.move(".software.parabola-maintenance.cron-rshg054") + return mail.move(".software.parabola-maintenance") return + + if is_to_or_from(mail, "parabola.nu"): + mail.move(".software.parabola-labs") + return + if ( False or mail["List-Id"].matches("parabolagnulinux.org") or is_to_or_from(mail, "parabolagnulinux.org") - or is_to_or_from(mail, "parabola.nu") + or is_to_or_from(mail, "kiwwwi.com.ar") ): + if mail["Subject"].contains("[Django]"): + mail.move(".software.parabola-maintenance.django") + return mail.move(".software.parabola-dev") return @@ -106,6 +138,10 @@ def my_filters(mail): mail.move(".software.pacman-dev") return + if (mail["List-Id"].matches("systemd-devel.lists.freedesktop.org")): + mail.move(".software.systemd-devel") + return + for subject_re in [ "\[Stow-[^\]]*\].*", ]: @@ -153,6 +189,7 @@ def my_filters(mail): 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") + or is_to_or_from(mail,"crossroadsbsa.org") ): mail.move(".Troop276") return @@ -165,8 +202,10 @@ def my_filters(mail): for address in [ "justicejade10@aol.com", "parsonsjade@aol.com", + "parsonstjade@gmail.com", + "jadparso@umail.iu.edu", ]: - if mail["From"].contains(address): + if is_to_or_from(mail,address): mail.move(".misc.Jade") return @@ -189,29 +228,29 @@ def my_filters(mail): # Sort mail from FRC people for address in [ - "jeffreysmith@msdlt.k12.in.us", - "jason.zielke@gmail.com", - "allison.m.babcock@gmail.com", - "william.walk@gmail.com", + "@ni.com", + "@usfirst.org", "BBonahoom@stanleyworks.com", - "wcxctrack829@aim.com", # Pat + "allison.m.babcock@gmail.com", + "bryanbonahoom@gmail.com", + "cdewalt3@yahoo.com", + "dave.nelson@ecolab.com", + "dickaustin190@yahoo.com", "djnels1@comcast.net", # Dave and Julie Nelson + "gamefreak207@gmail.com", # Brett Leedy + "jason.zielke@gmail.com", + "jeffreysmith@msdlt.k12.in.us", "sarahlittell@comcast.net", + "silioso@gmail.com", "skiplittell@comcast.net", - "dave.nelson@ecolab.com", - "@ni.com", - "@usfirst.org", - "gamefreak207@gmail.com", # Brett Leedy "tswilson4801@att.net", - "silioso@gmail.com", - "cdewalt3@yahoo.com", - "bryanbonahoom@gmail.com", + "wcxctrack829@aim.com", # Pat + "william.walk@gmail.com", ]: if is_to_or_from(mail,address): mail.move(".School.Robotics") return for subject_re in [ - "FIRST", "robotics", "1024", "kil-?a-?bytes", @@ -222,19 +261,21 @@ def my_filters(mail): # Sort mail from software people for address in [ - "gnu.org", + "@archlinux.org", + "@fsf.org", + "@github.com", + "canonical.org", + "cnuk.org", "eff.org", + "esr@thyrsus.com", + "foocorp.net", "gitorious.org", - "sourceforge.com", + "gnome.org", + "gnu.org", "ietf.org", "kde.org", + "sourceforge.com", "trustees@core3.amsl.com", - "esr@thyrsus.com", - "canonical.org", - "foocorp.net", - "cnuk.org", - "@archlinux.org", - "@github.com", ]: if is_to_or_from(mail,address): mail.move(".software") @@ -276,6 +317,7 @@ def my_filters(mail): or mail["Subject"].contains("newsletter") or mail["From"].contains("Info@mailing.jamendo.com") or mail["From"].contains("info@demandprogress.org") + or (mail["From"].contains("@sparkfun.com") and mail["Message-Id"].contains("rsgsv.net")) ): mail.move(".misc.Newsletters") return @@ -305,10 +347,10 @@ def my_filters(mail): return if ( False - or mail["From"].contains(".edu") + #or mail["From"].contains(".edu") or mail["From"].contains("admissions@") - or mail["From"].contains("college") - or mail["From"].contains("university") + #or mail["From"].contains("college") + #or mail["From"].contains("university") or mail["Subject"].contains("college") # now we get to the BS or mail["From"].contains("@dreamitdoitindiana.com") diff --git a/.config/offlineimaprc b/.config/offlineimaprc index 319593c..d027001 100644 --- a/.config/offlineimaprc +++ b/.config/offlineimaprc @@ -1,25 +1,25 @@ # -*- Mode: Conf -*- [general] -accounts = LukeShu +accounts = ATT,Purdue -[Account LukeShu] -localrepository = Local -remoterepository = Remote +## AT&T ############################################################### -[Repository Local] +[Account ATT] +localrepository = Local-Main +remoterepository = Remote-SBCGlobal + +[Repository Local-Main] 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)) - -[Repository Remote] +[Repository Remote-SBCGlobal] type = IMAP ssl = yes -cert_fingerprint = 700d84baa7e852240178dc2de18e7e528a2854df +cert_fingerprint = a6ee8d759eb76dafacffffc47c4507d51f444984 remotehost = imap.mail.yahoo.com remoteuser = lukeshu@sbcglobal.net folderfilter = lambda foldername: not re.search('(Trash|Del)', foldername) @@ -27,3 +27,23 @@ 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) + +## Purdue ############################################################ + +[Account Purdue] +localrepository = Local-Purdue +remoterepository = Remote-Purdue + +[Repository Local-Purdue] +type = Maildir +localfolders = ~/Maildir.purdue +sep = . +folderfilter = lambda foldername: re.search('INBOX', foldername) + +[Repository Remote-Purdue] +type = IMAP +ssl = yes +cert_fingerprint = 2189e7d568d93352fcdccaa24137856191703c4a +remotehost = mymail.purdue.edu +remoteuser = shumakl +folderfilter = lambda foldername: re.search('INBOX', foldername) diff --git a/.config/ssh/authorized_keys b/.config/ssh/authorized_keys new file mode 100644 index 0000000..559db0b --- /dev/null +++ b/.config/ssh/authorized_keys @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAP1prJhR7vEDJczVYK2otEMX3yiQTh35qwzQl0gKqIoaK/kkh36DHtMgGw1XyIG+LsowgxWGTi8wGxFwEbNVUDPVxnZrBsZq8RhhltFH1i6xLzAa8yAFfRC5Y9Rg5i27//GwfjaZggiMnI9QpvJFuuFVSXY7n2hymZtm8HzaXLuNAAAAFQDsncdoWgp33q+9uq4Bvk+of5ABEQAAAIEAl55Q6bFiGvnyDauH0dsYOu80MdF6xSPu3T8UORsblmNJzhhFcHpTsqK78jFtfKoirZgzTN481gmzi9GHOcfdEHRGkou4xKw9bFPxOpDLxpVd9HI8KYGi2CfoQNb3uAcIPZGEUNGliBbsWdmanv59aNLt4BVmgcVO2AWMqdkPd6UAAACBAJmLZckCmMKLAQtpl/A9dC5Ny8WtaNHjTdhc6qt5rFG9h0XQ0NO54s0JF3mE9DO/6JYzK2RJsBeSucCBSaAkmJkGt7EI3BvZn7qbzDv4AatFDJs0SG/S89Qu4KrDsogGSiI37Kpa69QpK7sBUyCf9Si7/kxF008QzwU/ufzNmvTV shumakl@cs.purdue.edu diff --git a/.config/ssh/known_hosts b/.config/ssh/known_hosts new file mode 100644 index 0000000..a70ec49 --- /dev/null +++ b/.config/ssh/known_hosts @@ -0,0 +1,8 @@ +gitorious.org,87.238.52.168 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwurz6NXf01Lc2HTGvPGN2RRIjW5zZ4qI8dCTdhr6R241VXO30X29EpBPRFTe3K9Zx7BXAM1XzQaV093xT8jX6X0gP/vJD2y+vDN2IDx2GeLX1k0cevhCj2mn8Su3ZWw5s9bBhVvpSvrE9uLRho2Qe/x5hJt2804KDyRGWn3esVP2dYRbf4r4TBLX/oWziDv64x5G0SkY8YsX2ZbKSX1Biw4oQXSx5jKOaCjNS+ryJFVmiIBqHa7Voi3LgJT/lHZV39sKbMNcnsQNjtkB1eqzzvdwO5RPfF0YbwjFQ5SywmrtkAqYmDOOPUDrvDChbbrS7hge4rDK/oeVjwdV718jVw== +github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +[lukeshu.ath.cx]:6422,[128.211.198.17]:6422 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIAGyEB6rfXZc71rZ/p+9wh50VZOC3KHlqJiLtbK9KWMFkBmSOqm3FvuqA0fl7Z1+XqxZY69vJ2ZmQ8G/UIZtIw= +192.30.252.128 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +192.30.252.129 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +192.30.252.131 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +[lukeshu.com]:1863,[199.180.255.147]:1863 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJ7RUMtkyw4vL6AnDaTe9BQnJcrfZ3wgE1Y2zOaQ7IN76faZ0NhlKPSmwykEZxAHRD3f/2RgFDN/nWsJO7rwZSU= +[parabolagnulinux.org]:1863,[142.4.205.9]:1863 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHkqv9ewWyXjrO6P5iYiUYfEYP8ALBg9C2GxA7yOJDa/vwDtx6OS3KMNRkUgx6vL/6/D555Xdypys+lwLmcdmnM= diff --git a/.config/wmii-hg/autostart b/.config/wmii-hg/autostart index aae23f4..f329a5e 100755 --- a/.config/wmii-hg/autostart +++ b/.config/wmii-hg/autostart @@ -1,4 +1,2 @@ #!/bin/bash daemon lxpanel &> /dev/null -daemon wicd-client -t &> /dev/null -daemon notifyd &> /dev/null diff --git a/.config/wmii-hg/include.sh b/.config/wmii-hg/include.sh index 36f8f3e..bd9456f 100644 --- a/.config/wmii-hg/include.sh +++ b/.config/wmii-hg/include.sh @@ -1,70 +1,11 @@ #!/bin/bash -if [ -z "$WMII_NAMESPACE" ]; then - export WMII_NAMESPACE=`wmiir namespace` +if [[ -z "$WMII_NAMESPACE" ]]; then + export WMII_NAMESPACE="`wmiir namespace`" fi -if [ -z "$WMII_DIR" ]; then - export WMII_DIR=$WMII_NAMESPACE/mnt +if [[ -z "$WMII_DIR" ]]; then + export WMII_DIR="$HOME/n/wmii${DISPLAY}" fi -# a -- a work-around for buggy IO append in 9pfuse -# useing '|a' should be just like using '>>', but will work -# when 9pfuse decides to bug out. -a() { - f="${1/#${WMII_DIR}/}" - if [ "$f" = "$1" ]; then - cat >> "$1" - else - if wmiir ls "$f" &>/dev/null; then - wmiir write "$f" - else - wmiir create "$f" - fi - fi -} - -# I like wmiir's setsid better than linux-utils' -setsid() { wmiir setsid "$@"; } - -path_ls() { - find -L `echo "$@"|sed 'y/:/ /'` -maxdepth 1 -type f -executable -printf '%f\n' 2>/dev/null| sort -u -} - -path_which() { - mypath=$1 - prog=$2 - which=`which which` - PATH="$mypath" "$which" -- "$prog" 2>/dev/null -} - - -lstags() { - ls $WMII_DIR/tag | sed '/^sel$/d' -} - -scansection() { - file=`path_which "$WMII_CONFPATH" wmiirc` - sec=$1 - tmp=`mktemp` - if [ -n "$sec" ]; then - < "$file" sed -n "/^\s*$sec\s*()/,/##\s*End $sec/p" | sed '1d;$d'> $tmp - else - < "$file" sed "/\s*}\s*##\s*End\s/d" > $tmp - fi - < $tmp sed -n '/##/p'|sed -r 's/^\s*(.*)\)\s*## ?/\t\1\t/;s/\s*## ?//' - rm $tmp -} - -conffile() { - echo "$HOME/.wmii/$@" -} - -Action() { - prog=`path_which "$WMII_CONFPATH" $1`; shift - if [ -n "$prog" ]; then - "$prog" "$@" - return $? - else - return 1 - fi -} +. util.sh +. config.sh diff --git a/.config/wmii-hg/quit b/.config/wmii-hg/quit index 54f64e7..27d9052 100755 --- a/.config/wmii-hg/quit +++ b/.config/wmii-hg/quit @@ -1,3 +1,3 @@ #!/bin/bash -. "$HOME/.wmii/include.sh" -echo quit |a $WMII_DIR/ctl +. include.sh +echo quit >> $WMII_DIR/ctl diff --git a/.config/wmii-hg/rbar_battery b/.config/wmii-hg/rbar_battery index 7a7f24f..f632f7e 100755 --- a/.config/wmii-hg/rbar_battery +++ b/.config/wmii-hg/rbar_battery @@ -1,10 +1,9 @@ #!/bin/bash -. "$HOME/.wmii/include.sh" +. include.sh priority=$1 -set -e -while true; do - acpi -b |a "$WMII_DIR/rbar/${priority}_battery" +while connected_to_x_server; do + printf 'label %s\n' "$(acpi -b)" >> "$WMII_DIR/rbar/${priority}_battery" sleep 1 done diff --git a/.config/wmii-hg/rbar_clock b/.config/wmii-hg/rbar_clock index 8e7d2a4..6aecb92 100755 --- a/.config/wmii-hg/rbar_clock +++ b/.config/wmii-hg/rbar_clock @@ -1,10 +1,9 @@ #!/bin/bash -. "$HOME/.wmii/include.sh" +. include.sh priority=$1 -set -e -while true; do - date |a "$WMII_DIR/rbar/${priority}_clock" +while connected_to_x_server; do + printf 'label %s\n' "$(date)" >> "$WMII_DIR/rbar/${priority}_clock" sleep .5 done diff --git a/.config/wmii-hg/rbar_cpu b/.config/wmii-hg/rbar_cpu index 7f891da..5531e60 100755 --- a/.config/wmii-hg/rbar_cpu +++ b/.config/wmii-hg/rbar_cpu @@ -1,13 +1,12 @@ #!/bin/bash -. "$HOME/.wmii/include.sh" +. include.sh priority=$1 -set -e -while true; do +while connected_to_x_server; do # This doesn't work for me, it shows capacity - #echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;') |a "$WMII_DIR/rbar/${priority}_cpu" + #echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;') >> "$WMII_DIR/rbar/${priority}_cpu" # This actually displays %idle - echo 'CPU: [ '$(tail -n3 ~/tmp/cputime|sed -ur 's/\s\s+/\t/g'|cut -f2,11|sed 's/\t\(.*\)/(\1)/')' ]' |a "$WMII_DIR/rbar/${priority}_cpu" + echo 'label CPU: [ '$(tail -n3 ~/tmp/cputime|sed -ur 's/\s\s+/\t/g'|cut -f2,11|sed 's/\t\(.*\)/(\1)/')' ]' >> "$WMII_DIR/rbar/${priority}_cpu" sleep 1 done diff --git a/.config/wmii-hg/rbar_wifi b/.config/wmii-hg/rbar_wifi index 608b164..18395a3 100755 --- a/.config/wmii-hg/rbar_wifi +++ b/.config/wmii-hg/rbar_wifi @@ -1,10 +1,9 @@ #!/bin/bash -. "$HOME/.wmii/include.sh" +. include.sh priority=$1 -set -e -while true; do - echo 'Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality) |a "$WMII_DIR/rbar/${priority}_wifi" +while connected_to_x_server; do + echo 'label Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality) >> "$WMII_DIR/rbar/${priority}_wifi" sleep 1 done -- cgit v1.1-4-g5e80