Merge remote-tracking branch 'refs/remotes/origin/master'

4 files changed, 29 insertions, 14 deletions

diff --git a/.muttrc b/.muttrc
index 06206ad..d85c90c 100644
--- a/.muttrc
+++ b/.muttrc
@@ -85,7 +85,7 @@ set ispell="aspell -e -c"
 
 # set up the sidebar, default not visible
 set mail_check_stats=yes
-set sidebar_visible = yes
+set sidebar_visible = no
 set sidebar_short_path = yes
 set sidebar_folder_indent = yes
 set sidebar_width = 25
diff --git a/.reportbugrc b/.reportbugrc
index 17e787a..0772b6a 100644
--- a/.reportbugrc
+++ b/.reportbugrc
@@ -13,4 +13,8 @@ email "rak@debian.org"
 # /etc/reportbug.conf for a full listing of options.
 keyid 4E469519ED677734268FBD958F7BF8FC4A11C97A
 sign gpg
+# Don't BCC me
+no-cc
+# But have debbugs notify me of the bug report once it has a number
+list-cc-me
 mutt
diff --git a/.zshenv b/.zshenv
index c3719cf..4d24e85 100644
--- a/.zshenv
+++ b/.zshenv
@@ -7,20 +7,18 @@ if [[ `uname` == "Darwin" ]]; then
 fi
 
 aklogs () {
-    for r in CS.CMU.EDU ANDREW.CMU.EDU CLUB.CC.CMU.EDU; do
+    for r in ANDREW.CMU.EDU CLUB.CC.CMU.EDU; do
         KRB5CCNAME=`KRB5CCNAME=DIR:$HOME/.cache/krb5cc klist -l | grep $r | sed -e s'/.*:://g'` aklog -c $r -k $r
-        if test "x$r" = "xCS.CMU.EDU"; then
-            KRB5CCNAME=`KRB5CCNAME=DIR:$HOME/.cache/krb5cc klist -l | grep $r | sed -e s'/.*:://g'` aklog -c club.cc.cmu.edu
-        fi
     done
 }
+
 kinits () {
-    kinit -r 200h -f rkavanag@CS.CMU.EDU
     kinit -r 200h -f rkavanag@ANDREW.CMU.EDU
     kinit -r 200h -f rak@CLUB.CC.CMU.EDU
 }
+
 rkinits () {
-    for r in rkavanag@CS.CMU.EDU rkavanag@ANDREW.CMU.EDU rak@CLUB.CC.CMU.EDU; do
+    for r in rkavanag@ANDREW.CMU.EDU rak@CLUB.CC.CMU.EDU; do
         KRB5CCNAME=`KRB5CCNAME=DIR:$HOME/.cache/krb5cc klist -l | grep $r | sed -e s'/.*:://g'` kinit -R $r
     done
     KRB5CCNAME=DIR:$HOME/.cache/krb5cc aklogs
diff --git a/bin/tmcg b/bin/tmcg
index fe68830..d94abbc 100755
--- a/bin/tmcg
+++ b/bin/tmcg
@@ -1,11 +1,24 @@
 #!/bin/sh
 
-if ! tmux switch -t mail:catgirl >/dev/null 2>&1; then
+current_session () {
+    tty=$(tty)
+    for s in $(tmux list-sessions -F '#{session_name}'); do
+            tmux list-panes -F '#{pane_tty} #{session_name}' -t "$s"
+    done | grep "${tty}" | awk '{print $2}'
+}
+
+SESSION=$(current_session)
+
+if [ "x${SESSION}" = "x" ]; then
+    SESSION="irc"
+    tmux new-session -s "${SESSION}" -d
+fi
+
+if ! tmux switch -t ${SESSION}:catgirl >/dev/null 2>&1; then
     tmux new-window -c '~' -n catgirl     catgirl libera
-    tmux split-window -t mail:catgirl -c '~' catgirl oftc
-    tmux split-window -t mail:catgirl -c '~' catgirl sdf
-    tmux split-window -t mail:catgirl -c '~' catgirl tilde
-    tmux split-window -t mail:catgirl -c '~' catgirl bitlbee
-    tmux set-option -t mail:catgirl remain-on-exit on
-    tmux selectl -t mail:catgirl tiled
+    tmux split-window -t ${SESSION}:catgirl -c '~' catgirl oftc
+    tmux split-window -t ${SESSION}:catgirl -c '~' catgirl sdf
+    tmux split-window -t ${SESSION}:catgirl -c '~' catgirl tilde
+    tmux set-option -t ${SESSION}:catgirl remain-on-exit on
+    tmux selectl -t ${SESSION}:catgirl tiled
 fi