Add contexts, and don't show waiting, blocked

6 files changed, 45 insertions, 29 deletions

diff --git a/bashrc b/bashrc
index f415791..34993bd 100644
--- a/bashrc
+++ b/bashrc
@@ -56,17 +56,30 @@ git_prompt_part()
     fi
 }
 
+QL()
+{
+    case "$DEBEMAIL" in
+    *@qvarnlabs.com) echo '[QL] ' ;;
+    esac
+}
+
 iconpart="`whoami`@`hostname`: "
 titlepart="`whoami`@`hostname` -- "
 prompt_command() { 
     prompt_status=$?
+    if [ -r /etc/debian_chroot ]
+    then
+        debian_chroot="$(cat /etc/debian_chroot) "
+    else
+        debian_chroot=""
+    fi
     if [ $prompt_status != 0 ]
     then
             echo "$(start_error)[status $prompt_status]$(normal_mode)"
     fi
     base="`basename "$PWD"`"
     str2xterm "$base - $iconpart$PWD" "$base - $titlepart$PWD"
-    PS1="\\[$(start_bold)\\]$debian_chroot\\u@\\h$(git_prompt_part)\\[$(basename_mode)\\](\W)\\[$(start_bold)\\]\\$ \\[$(normal_mode)\\]"
+    PS1="\\[$(start_error)$(QL)$(normal_mode )\\]\\[$(start_bold)\\]$debian_chroot\\u@\\h$(git_prompt_part)\\[$(basename_mode)\\](\W)\\[$(start_bold)\\]\\$ \\[$(normal_mode)\\]"
 }
 
 we_have_term()
@@ -113,7 +126,7 @@ normal_mode()
 ulimit -c unlimited
 umask 002
 
-if command -v emacsclient > /dev/null
+if command -v emacs > /dev/null
 then
     export EDITOR=emacs
 else
@@ -122,23 +135,16 @@ fi
 export PAGER=less
 export LESSCHARSET=utf-8
 export HISTCONTROL=ignoredups
-export PATH="/usr/lib/ccache:$PATH:$HOME/bin"
+export PATH="$PATH:$HOME/bin"
 export PROMPT_COMMAND=prompt_command
-export PS1='\$ '
 export DEBEMAIL=liw@liw.fi
 export VIRSH_DEFAULT_CONNECT_URI=qemu:///system
 export LANG=en_GB.UTF-8
 export LC_COLLATE=fi_FI.UTF-8
-if [ -r /etc/debian_chroot ]
-then
-    debian_chroot="$(cat /etc/debian_chroot) "
-else
-    debian_chroot=""
-fi
 
 PROMPT_DIRTRIM=1
-# PS1 now set by PROMPT_COMMAND, since it is no longer static, and
-# may include data about current git branch.
-# PS1="\\[$(start_bold)\\]$debian_chroot\\u@\\h\\$ \\[$(normal_mode)\\]"
 
 set +H
+bind -r ''
+
+echo TEMP BASHRC
diff --git a/liw.cronish b/liw.cronish
index a1808ef..48fcd67 100644
--- a/liw.cronish
+++ b/liw.cronish
@@ -29,13 +29,13 @@ wotsap:
             touch /home/liw/.wotsapdb
         fi
 
-gpg_refresh:
-    trigger-file: /home/liw/.gnupg/refresh.stamp
-    trigger-age: 604800
-    command: |
-        gpg2 --refresh-keys
-        gpg2 --send-keys B8611E9C 2D9ACC8E
-        touch /home/liw/.gnupg/refresh.stamp
+#gpg_refresh:
+#    trigger-file: /home/liw/.gnupg/refresh.stamp
+#    trigger-age: 604800
+#    command: |
+#        gpg2 --refresh-keys
+#        gpg2 --send-keys B8611E9C 2D9ACC8E
+#        touch /home/liw/.gnupg/refresh.stamp
 
 # Disabled because I no longer have a separate work laptop.
 # annex:
@@ -65,9 +65,9 @@ gpg_refresh:
 #              $HOME/Tilaajavastuu/. /media/liw/LASUBACKUP/Tilaajavastuu/.
 #      fi
 
-debmirror:
-    interval: 3600
-    command: flock -nE0 /home/liw/tmp/debmirror.lock /home/liw/bin/mirror-debian-e1
+#debmirror:
+#    interval: 3600
+#    command: flock -nE0 /home/liw/tmp/debmirror.lock /home/liw/bin/mirror-debian-e1
 
 branchablelogs:
     trigger-file: /home/liw/data/branchable-logs/timestamp
diff --git a/mutt/muttrc-common b/mutt/muttrc-common
index d24b770..956bc2c 100644
--- a/mutt/muttrc-common
+++ b/mutt/muttrc-common
@@ -47,3 +47,8 @@ set timeout=30
 ## quit by esc-q.
 bind index q noop
 bind index <esc>q exit
+
+## Bind i so it doesn't do chnage-newsgroup, which I have no use for,
+## and instead takes me to index of messages, as it used to.
+bind pager i exit
+bind index i noop
diff --git a/mutt/muttrc-exolobe1 b/mutt/muttrc-exolobe1
index d4fe54d..c18bb90 100644
--- a/mutt/muttrc-exolobe1
+++ b/mutt/muttrc-exolobe1
@@ -18,3 +18,4 @@ source "~/liw-dot-files/mutt/muttrc-colours"
 set crypt_autosign=yes
 set crypt_replysign=yes
 set crypt_replysignencrypted=yes
+alias debian-events- debian-events-eu@lists.debian.org
diff --git a/signature b/signature
index 1049d8e..7f3f432 100644
--- a/signature
+++ b/signature
@@ -1,2 +1 @@
-Schrödinger's backup hypothesis: the condition of any backup is
-undefined until a restore is attempted. -- andrewsh
+I want to build worthwhile things that might last. --joeyh
diff --git a/taskrc b/taskrc
index e83deec..c08a76e 100644
--- a/taskrc
+++ b/taskrc
@@ -14,9 +14,9 @@
 report.soonish.description=Lists tasks that should be done soonish
 report.soonish.columns=id,project,scheduled,due,depends,tags,estimate,description
 report.soonish.labels=ID,Proj,Scheduled,Due,Deps,Tags,Est,Description
-report.soonish.sort=urgency-,due+,scheduled+,priority-,project+
-report.soonish.filter=status:pending ( pri:H or pri:M ) ( due: or due.before:7days ) ( scheduled: or scheduled.before:7days )
-
+#report.soonish.sort=urgency-,due+,scheduled+,priority-,project+
+report.soonish.sort=urgency+,due-,scheduled-,priority+,project-
+report.soonish.filter=status:pending ( pri:H or pri:M ) ( due: or due.before:2days ) ( scheduled: or scheduled.before:2days ) -waiting -BLOCKED
 
 # Make the soonish report the default.
 default.command=soonish
@@ -65,7 +65,7 @@ urgency.tags.coefficient=0.0
 urgency.annotations.coefficient=0.0
 urgency.age.coefficient=0.0
 urgency.age.max=0
-urgency.user.tag.waiting.coefficient=-3.0
+urgency.user.tag.waiting.coefficient=-50.0
 # urgency.user.project.<project>.coefficient=...
 # urgency.uda.<name>.coefficient=...
 
@@ -144,3 +144,8 @@ color.sync.rejected=
 
 color.undo.after=
 color.undo.before=
+context.Home=+home -waiting -BLOCKED
+context.Office=+office -waiting -BLOCKED
+context.Helsinki=+hki -waiting -BLOCKED
+context.Agenda=+agenda -waiting -BLOCKED
+context.Laptop=+laptop -waiting -BLOCKED