Merge branch 'master' of https://github.com/davezerave/dot

fuckup

* 'master' of https://github.com/davezerave/dot:
  Made calling irssi more robust in tmux
  Adding server side irssi ignores

2 files changed, 11 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 8971c45..8f8ecfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -206,7 +206,10 @@ svn/
 .icedtea/
 .inkscape/
 .inputrc
-.irssi/
+.irssi/config*
+.irssi/logs/
+.irssi/scripts/autorun/
+.irssi/away.log
 .iscan_preference
 .jackdrc
 .java/
diff --git a/bin/irssi b/bin/irssi
index e041d11..edb0084 100755
--- a/bin/irssi
+++ b/bin/irssi
@@ -1,14 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env zsh
 # Script to start irssi within tmux with attached Nicklist in vertical split on right side
 
 if [[ $(hostname) == *frqrec* ]]; then
-  tmux splitw -h -p 10
-  tmux send-keys "cat ~/.irssi/nicklistfifo" C-m
-  tmux selectp -L
-  tmux send-keys /usr/bin/irssi C-m
-  sleep 1
-  tmux send-keys "/NICKLIST FIFO" C-m
   tmux renamew irssi
+  tmux splitw -h -p 10
+  tmux send-keys -t irssi.1 "cat ~/.irssi/nicklistfifo" C-m
+  tmux select-pane -t irssi.0
+  (sleep 3 && tmux send-keys -t irssi.0 "/nicklist fifo" C-m)&
+  /usr/bin/irssi
+  wait && tmux kill-pane -t irssi.1 && tmux rename-window $(ps -p $$|grep pts|cut -c16-|cut -d ' ' -f2)
 else
   /usr/bin/irssi
 fi