Update move in scripts, add bin scripts

8 files changed, 101 insertions, 30 deletions

diff --git a/common_move_in.sh b/common_move_in.sh
index 1a441b6..ee431ee 100755
--- a/common_move_in.sh
+++ b/common_move_in.sh
@@ -1,25 +1,24 @@
 #!/bin/bash
+cd $HOME/dotfiles/
+
+if ! [ -d "$HOME/.git" ]; then
+    echo "Linking git settings..."
+    stow git
+fi
 
 if ! [ -d "$HOME/.oh-my-zsh" ]; then
     echo "Installing Oh My ZSH"
-    curl -L http://install.ohmyz.sh | sh
+    curl --location http://install.ohmyz.sh | sh
 
     # Remove the default config in favor of our own later on in this script
     rm $HOME/.zshrc
+    chsh -s `which zsh`
 fi
 
 if ! [ -d "$HOME/Code" ]; then
     mkdir $HOME/Code
 fi
 
-if ! [ -d "$HOME/dotfiles" ]; then
-    git clone git@beehive.io:jason/dotfiles.git
-    cd dotfiles
-else
-    cd dotfiles
-    git pull
-fi
-
 if ! [ -e "$HOME/.vimrc" ]; then
     echo "Linking vim settings..."
     stow vim
@@ -30,26 +29,15 @@ if ! [ -e "$HOME/.zshrc" ]; then
     stow zsh
 fi
 
-# OS X Only setup
-if [[ $OSTYPE == darwin* ]]; then
-    if ! [ -e "$HOME/.amethyst" ]; then
-        echo "Linking amethyst config..."
-        stow amethyst
-    fi
-
-    if [ -e "/usr/bin/vagrant" ] && [ -e "$CWD/../vagrant-vmware-license.lic" ]; then
-        echo "Installing Vagrant support for VMWare Fusion..."
-        vagrant plugin install vagrant-vmware-fusion
-        vagrant plugin license vagrant-vmware-fusion "$CWD/../vagrant-vmware-license.lic"
-    fi
-fi
-
-CWD=`pwd`
-
-if ! [ -e "$HOME/bin"]; then
+if ! [ -e "$HOME/bin" ]; then
     mkdir $HOME/bin/
     cd $HOME/bin/
     curl -O http://orgmode.org/worg/code/awk/ical2org.awk
 fi
 
-echo "Done."
+if ! [ -e "$HOME/.ssh" ]; then
+    mkdir $HOME/.ssh/
+fi
+if ! [ -e "$HOME/.ssh/id_rsa" ]; then
+    ssh-keygen -t rsa -b 4096
+fi
diff --git a/move_in.sh b/move_in.sh
index 453208b..93985d1 100755
--- a/move_in.sh
+++ b/move_in.sh
@@ -1,15 +1,33 @@
 #!/bin/bash
+CWD=`pwd`
 
+# letsencrypt CA certs aren't installed yet so we pass --insecure
 CURL='curl --silent --insecure --location'
 
 if [[ $OSTYPE == darwin* ]]; then
     echo "OS X detected. Executing os-x_move_in.sh"
     $CURL https://beehive.io/jason/dotfiles/raw/master/os-x_move_in.sh
+
+    if ! [ -e "$HOME/.amethyst" ]; then
+        echo "Linking amethyst config..."
+        stow amethyst
+    fi
+
+    if [ -e "/usr/bin/vagrant" ] && [ -e "$CWD/../vagrant-vmware-license.lic" ]; then
+        echo "Installing Vagrant support for VMWare Fusion..."
+        vagrant plugin install vagrant-vmware-fusion
+        vagrant plugin license vagrant-vmware-fusion "$CWD/../vagrant-vmware-license.lic"
+    fi
+
 fi
 
 if [[ $OSTYPE == linux-gnu ]]; then
     if [[ `lsb_release -i -s` == Ubuntu ]]; then
         echo "Ubuntu detected. Executing ubuntu_move_in.sh"
+        sudo apt-get install -y curl
         $CURL https://beehive.io/jason/dotfiles/raw/master/ubuntu_move_in.sh | sh
     fi
 fi
+
+cd $CWD
+echo "Done."
diff --git a/scripts/bin/fix_screens_at_work.sh b/scripts/bin/fix_screens_at_work.sh
new file mode 100755
index 0000000..5fa27a7
--- /dev/null
+++ b/scripts/bin/fix_screens_at_work.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#xrandr --setprovideroutputsource 1 0
+#xrandr --output DP-2 --mode 1920x1200
+xrandr --output DP-4 --right-of DP-2 --auto --primary --mode 2560x1440
+xrandr --output DVI-I-1-1 --below DP-4 --auto
+
+# For some reason, occasionally this needs to be executed twice
+xmodmap ~/.Xmodmap-pckeyboard_fix
+sleep 1
+xmodmap ~/.Xmodmap-pckeyboard_fix
diff --git a/scripts/bin/notifyvolume b/scripts/bin/notifyvolume
new file mode 100755
index 0000000..0da7337
--- /dev/null
+++ b/scripts/bin/notifyvolume
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec /usr/bin/notify-send -t 1000 -i volume-knob "Volume $(amixer -q | grep -A5 Master | grep '%' | cut -d'[' -f2 | cut -d']' -f1)"
diff --git a/scripts/bin/run-once b/scripts/bin/run-once
new file mode 100755
index 0000000..56f3709
--- /dev/null
+++ b/scripts/bin/run-once
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+# Run program unless it's already running.
+
+if [ -z "`ps -Af | grep -o -w ".*$1" | grep -v grep | grep -v run-once`" ]; then
+  $@
+fi
\ No newline at end of file
diff --git a/ubuntu_move_in.sh b/ubuntu_move_in.sh
index 3c18ed9..7dbfb0a 100644
--- a/ubuntu_move_in.sh
+++ b/ubuntu_move_in.sh
@@ -2,16 +2,60 @@ echo "Updaing and dist-upgrading"
 sudo apt-get update && sudo apt-get -y dist-upgrade
 
 echo "Installing some utilities"
-sudo apt-get install -y git stow
+sudo apt-get install -y build-essential git stow zsh \
+     rxvt-unicode-256color
 
 cd $HOME
 
 if ! [ -d "$HOME/dotfiles" ]; then
     echo "Dotfiles not found... cloning"
-    git clone git@beehive.io:jason/dotfiles.git
+    git -c http.sslVerify=false clone https://beehive.io/jason/dotfiles.git
     cd dotfiles
 else
     echo "Dotfiles found... updating"
     cd dotfiles
-    git pull
+    git -c http.sslVerify=false pull
 fi
+
+./common_move_in.sh
+
+cd $HOME/dotfiles/
+echo "Linking xorg configs..."
+stow xorg
+
+# emacs
+if ! [ -x /usr/local/bin/emacs ]; then
+    echo "Installing Emacs from source..."
+    if ! [ -d "$HOME/Code/emacs" ]; then
+        cd $HOME/Code
+        git clone git://git.sv.gnu.org/emacs.git
+    fi
+
+    sudo apt-get -y install autoconf automake texinfo \
+         xserver-xorg-dev libgtk-3-dev libwebkitgtk-3.0-dev \
+         libjpeg-dev libgif-dev libxpm-dev libtiff5-dev \
+         libncurses5-dev libgnutls28-dev libmagick++-dev libotf-dev \
+         libselinux1-dev libgconf2-dev libacl1-dev libgpm-dev \
+         libm17n-dev
+
+    cd $HOME/Code/emacs/ && \
+        git checkout emacs-25.1 &&\
+        ./autogen.sh && \
+        make clean &&\
+        ./configure CFLAGS=-no-pie --with-xwidgets --with-sound --with-x-toolkit=gtk3 --with-gnutls && \
+        make && \
+        sudo make install
+
+
+fi
+
+# i3
+if ! [ `which i3` ]; then
+    echo "Installing i3..."
+    sudo apt-get install -y i3
+    cd $HOME/dotfiles/
+    stow i3
+fi
+
+# other utils
+sudo apt-get install -y clipit feh xbindkeys fetchmail qasmixer
diff --git a/vim/colors/synic.vim b/vim/.vim/colors/synic.vim
index 719a529..719a529 100755
--- a/vim/colors/synic.vim
+++ b/vim/.vim/colors/synic.vim
diff --git a/vim/vimrc b/vim/.vimrc
index 4e1757c..4e1757c 100755
--- a/vim/vimrc
+++ b/vim/.vimrc