summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2015-11-22 20:40:23 +0000
committerSean Whitton <spwhitton@spwhitton.name>2015-11-22 20:42:17 +0000
commitc67a1bbec0594dd88bd3bf98a20047ab7f768aeb (patch)
treed171f62614224ba7892f035329fba957de0d0bbc
parentbbc6b739a77c2766636d135704665147aecb91bd (diff)
downloaddotfiles-c67a1bbec0594dd88bd3bf98a20047ab7f768aeb.tar.gz
update ii for athena (and .irssi in home-mrconfig)
-rwxr-xr-xbin/ii8
-rw-r--r--home-mrconfig6
2 files changed, 6 insertions, 8 deletions
diff --git a/bin/ii b/bin/ii
index 3d14cbf7..7a9dc405 100755
--- a/bin/ii
+++ b/bin/ii
@@ -2,13 +2,11 @@
. $HOME/.shenv
-if [ "$(hostname -f)" = "ma.sdf.org" ]; then
+if [ "$(hostname -f)" = "athena.silentflame.com" ]; then
# start irssi under dtach if it's not running
if ! pgrep -u $LOGNAME irssi >/dev/null; then
rm -f $HOME/local/irssi.dtach.socket
- bitlbee_startup
- sleep 10
- TZ=MST dtach -n $HOME/local/irssi.dtach.socket junest irssi
+ TZ=MST dtach -n $HOME/local/irssi.dtach.socket irssi
fi
# if we're not at a dumb terminal (so this script can be shoved in a
@@ -20,5 +18,5 @@ if [ "$(hostname -f)" = "ma.sdf.org" ]; then
fi
else
# on a workstation, get connected to ma
- softbeep ssh -t ma dtach -a local/irssi.dtach.socket
+ softbeep ssh -t athena dtach -a local/irssi.dtach.socket
fi
diff --git a/home-mrconfig b/home-mrconfig
index cddf44de..bac8a6a8 100644
--- a/home-mrconfig
+++ b/home-mrconfig
@@ -188,8 +188,8 @@ fixups =
# symlink. That way Emacs junk that gets dumped in ~/.emacs.d doesn't
# have to be put into .gitignore. Similarly the XDG autostart folder,
# .ssh and lib and more
-pre_stow = $HOME/src/dotfiles/bin/unskel; mkdir -p ~/.emacs.d ~/.config/autostart ~/.ssh ~/lib ~/.cabal ~/.config/xfce4/desktop ~/.config/xfce4/xfconf/xfce-perchannel-xml ~/.gnupg ~/.config/Thunar
-pre_checkout = mkdir -p ~/.emacs.d ~/.config/autostart ~/.ssh ~/lib ~/.cabal ~/.xmonad ~/.config/xfce4/desktop ~/.config/xfce4/xfconf/xfce-perchannel-xml ~/.gnupg ~/.config/Thunar
+pre_stow = $HOME/src/dotfiles/bin/unskel; mkdir -p ~/.emacs.d ~/.config/autostart ~/.ssh ~/lib ~/.cabal ~/.config/xfce4/desktop ~/.config/xfce4/xfconf/xfce-perchannel-xml ~/.gnupg ~/.config/Thunar ~/.irssi
+pre_checkout = mkdir -p ~/.emacs.d ~/.config/autostart ~/.ssh ~/lib ~/.cabal ~/.xmonad ~/.config/xfce4/desktop ~/.config/xfce4/xfconf/xfce-perchannel-xml ~/.gnupg ~/.config/Thunar ~/.irssi
# GTK insists on replacing the symlink to its bookmarks file with the
# actual file even if the bookmarks in that file don't change (XFCE
@@ -256,7 +256,7 @@ checkout = git clone athenap:athpriv athpriv
skip = ! mine
# since priv repo also stows into ~/.gnupg, make the dir first
-pre_stow = mkdir -p ~/.duply
+pre_stow = mkdir -p ~/.duply ~/.irssi
# --- hosts configuration