dotfiles

commit f74c7bc4f9c86457ae18ca44f0db5b3e3b64ef00
parent 26c525e307f558100ca0a5045a2ea17ce1596004
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date:   Thu,  3 Dec 2015 21:42:09 +0100

Merge branch 'master' of github.com:anders-dc/dotfiles

Diffstat:
M
.tmuxinator/cosmo.yml
 | 
2
+-
M
bin/battery-osx
 | 
3
++-
M
bin/iddqd-ssh
 | 
4
++--
M
bin/iddqd-ssh-X.sh
 | 
2
+-
M
bin/iddqd-ssh-poster.sh
 | 
6
+++---
M
bin/iddqd-ssh-sphere.sh
 | 
2
+-
M
bin/iddqd-ssh-vpn.sh
 | 
2
+-
M
osx-install.sh
 | 
2
++

8 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/.tmuxinator/cosmo.yml b/.tmuxinator/cosmo.yml
@@ -32,6 +32,6 @@ windows:
   - editor: vim index.php
   - server: bash ~/bin/cosmo-ssh
   - git: tig
-  - backup: make && watch -n 60 rsync -rav ~/Sites/cosmo/ ~/src/cosmo-backup/
+  - backup: make && watch -n 60 rsync -rav ~/code/cosmo/ ~/src/cosmo-backup/
   #- /tmp: cd /tmp && ls -lahG cosmo_*
   - utility:
diff --git a/bin/battery-osx b/bin/battery-osx
@@ -6,4 +6,5 @@ pmset -g batt | tail -n 1 |\
     sed 's/ discharging//' |\
     sed 's/ charged//' |\
     sed 's/ 0:00//' |\
-    sed 's/ charging/ ☇/'
+    sed 's/ charging/ ☇/' |\
+    sed "s/drawingfrom'AC//"
diff --git a/bin/iddqd-ssh b/bin/iddqd-ssh
@@ -5,7 +5,7 @@ if [[ "$(ifconfig | grep 10.17.8)" ]]; then
     echo "On geo lan. Mounting sshfs and connecting directly..."
     sshfs-iddqd.sh
     #sshfs-iddqd-fix.sh
-    ssh adc@iddqd.nfit.au.dk -t 'bin/tmux-dev.sh'
+    ssh adc@iddqd.st.client.au.dk -t 'bin/tmux-dev.sh'
 #elif [[ "$(ip addr | grep 10.17.2)" ]]; then
 #    echo "On geo VPN. Mounting sshfs and connecting directly..."
     #sshfs-iddqd.sh
@@ -13,5 +13,5 @@ if [[ "$(ifconfig | grep 10.17.8)" ]]; then
 #    ssh adc@iddqd.nfit.au.dk -t 'bin/tmux-dev.sh'
 else
     echo "Outside geo lan, connecting through fresh-horse..."
-    ssh adc@fh.cs.au.dk -t 'ssh iddqd.nfit.au.dk -t "bin/tmux-dev.sh"'
+    ssh adc@fh.cs.au.dk -t 'ssh iddqd.st.client.au.dk -t "bin/tmux-dev.sh"'
 fi
diff --git a/bin/iddqd-ssh-X.sh b/bin/iddqd-ssh-X.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-ssh -X fh.cs.au.dk -t 'ssh -X iddqd.nfit.au.dk'
+ssh -X fh.cs.au.dk -t 'ssh -X iddqd.st.client.au.dk'
diff --git a/bin/iddqd-ssh-poster.sh b/bin/iddqd-ssh-poster.sh
@@ -2,11 +2,11 @@
 
 if [[ "$(ifconfig | grep 10.17.8)" ]]; then
     echo "On geo lan, connecting directly..."
-    ssh -X iddqd.nfit.au.dk -t 'tmuxinator poster'
+    ssh -X iddqd.st.client.au.dk -t 'tmuxinator poster'
 elif [[ "$(ifconfig | grep 10.17.2)" ]]; then
     echo "On geo VPN, connecting directly..."
-    ssh -X iddqd.nfit.au.dk -t 'tmuxinator poster'
+    ssh -X iddqd.st.client.au.dk -t 'tmuxinator poster'
 else
     echo "Outside geo lan, connecting through fresh-horse..."
-    ssh -X fh.cs.au.dk -t 'ssh -X iddqd.nfit.au.dk -t "tmuxinator poster"'
+    ssh -X fh.cs.au.dk -t 'ssh -X iddqd.st.client.au.dk -t "tmuxinator poster"'
 fi
diff --git a/bin/iddqd-ssh-sphere.sh b/bin/iddqd-ssh-sphere.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-ssh adc@fh.cs.au.dk -t 'ssh adc@iddqd.nfit.au.dk -t "bin/tmux-dev.sh"'
+ssh adc@fh.cs.au.dk -t 'ssh adc@iddqd.st.client.au.dk -t "bin/tmux-dev.sh"'
diff --git a/bin/iddqd-ssh-vpn.sh b/bin/iddqd-ssh-vpn.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-ssh adc@iddqd.nfit.au.dk
+ssh adc@iddqd.st.client.au.dk
diff --git a/osx-install.sh b/osx-install.sh
@@ -96,6 +96,8 @@ echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
     git clone https://github.com/tomislav/osx-terminal.app-colors-solarized \
         ~/code/dotfiles/osx-terminal.app-colors-solarized
+    wget https://raw.githubusercontent.com/altercation/solarized/master/iterm2-colors-solarized/Solarized%20Light.itermcolors
+    wget https://raw.githubusercontent.com/altercation/solarized/master/iterm2-colors-solarized/Solarized%20Dark.itermcolors
 fi
 
 read -p "Do you want to create symlinks in the home folder? [y/n]" -n 1 -r