i3 improvements. Merged sync.sh -t and -c flags. Fixed wemux installation.

i3/config

@@ -37,7 +37,7 @@ bar {
   status_command i3status --config ~/.i3/i3status.conf
   mode hide
   modifier Mod4
-  tray_output HDMI3
+  tray_output primary
   colors {
     background          $bg
     statusline          $fg
@@ -129,7 +129,7 @@ bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
 bindsym $mod+Shift+0 move container to workspace 10
 bindsym $mod+Shift+r reload
-bindsym $mod+Shift+minus exec --no-startup-id banshee --previous
+bindsym $mod+Shift+minus exec --no-startup-id banshee --restart-or-previous
 bindsym $mod+Shift+equal exec --no-startup-id banshee --next
 bindsym $mod+minus exec --no-startup-id banshee --pause
 bindsym $mod+equal exec --no-startup-id banshee --play

scripts/sync.sh

@@ -1,13 +1,14 @@
 ABSPATH=$(cd "$(dirname "$0")/.."; pwd)
-while getopts ":hbsdtclw" VALUE "$@"; do
+while getopts ":hbsdclw" VALUE "$@"; do
   if [ "$VALUE" = "h" ] ; then
     echo "sync.sh syncs configuration files, applications, and Vim bundles between computers"
     echo "    -h Shows this help"
     echo "    -b Syncs Vim bundles"
     echo "    -s Syncs computer with server applications in server.txt"
     echo "    -d Syncs computer with desktop applications in desktop.txt"
-    echo "    -t Syncs tmux configuration file"
     echo "    -c Syncs other configuration files"
+    echo "    -l Links standard ~ directories to lowercase"
+    echo "    -w Installs wemux [requires vim]"
   fi
   if [ "$VALUE" = "b" ] ; then
     mkdir -p ~/.vim/plugin/
@@ -17,8 +18,7 @@ while getopts ":hbsdtclw" VALUE "$@"; do
     mkdir -p ~/.vim/bundle/
     mkdir -p ~/.vim/bundle/
     echo "Installing vim bundles"
-    if [ ! -d ~/.vim/bundle/vundle/ ]
+    if [ ! -d ~/.vim/bundle/vundle/ ] ; then
-    then
       echo "Installing vundle"
       git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
     fi
@@ -47,18 +47,14 @@ while getopts ":hbsdtclw" VALUE "$@"; do
       brew install autojump ncdu htop vim youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld
     fi
   fi
-  if [ "$VALUE" = "t" ] ; then
-    echo "Syncing tmux"
-    rm ~/.tmux.conf
-    ln -s $ABSPATH/tmux/tmux.conf ~/.tmux.conf
-  fi
   if [ "$VALUE" = "c" ] ; then
     echo "Syncing config files"
     if which trash >/dev/null; then
-      trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources
+      trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources ~/.tmux.conf
     else
-      rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources
+      rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources ~/.tmux.conf
     fi
+    ln -s $ABSPATH/tmux/tmux.conf ~/.tmux.conf
     ln -s $ABSPATH/python/pylintrc ~/.pylintrc
     ln -s $ABSPATH/vim/vimrc ~/.vimrc
     ln -s $ABSPATH/vimperator/vimperatorrc ~/.vimperatorrc
@@ -74,6 +70,9 @@ while getopts ":hbsdtclw" VALUE "$@"; do
     if [ ! -d ~/.fzf ] ; then
       git clone https://github.com/junegunn/fzf.git ~/.fzf
     fi
+    if [ ! -d ~/.antigen ] ; then
+      git clone https://github.com/zsh-users/antigen ~/.antigen
+    fi
     ln -s $ABSPATH/shells/zshrc ~/.zshrc
     ln -s $ABSPATH/shells/screenrc ~/.screenrc
     ln -s $ABSPATH/shells/Xresources ~/.Xresources
@@ -99,11 +98,14 @@ while getopts ":hbsdtclw" VALUE "$@"; do
     echo "Done"
   fi
   if [ "$VALUE" = "w" ] ; then
+    echo "Installing wemux..."
     sudo git clone git://github.com/zolrath/wemux.git /usr/local/share/wemux
+    sudo rm -r /usr/local/bin/wemux
+    sudo rm -r /usr/local/etc/wemux.conf
     sudo ln -s /usr/local/share/wemux/wemux /usr/local/bin/wemux
     sudo cp /usr/local/share/wemux/wemux.conf.example /usr/local/etc/wemux.conf
-    sudo vi `which wemux` +"execute \"normal gg/tmux\<CR>nnnea -2\<Esc>nea -2\<Esc>ggZZ\""
+    sudo vim `which wemux` +"execute \"normal gg/tmux\<CR>nnnea -2\<Esc>nea -2\<Esc>ggZZ\""
-    sudo vi /usr/local/etc/wemux.conf +":execute \"normal gg/host_list\<CR>nnww\""
+    sudo vim /usr/local/etc/wemux.conf +":execute \"normal gg/host_list\<CR>nnww\""
   fi
 done
 echo "Done syncing"

shells/Xresources

@@ -9,7 +9,6 @@ xterm*eightBitInput: false
 *VT100*Translations:       #override  \
   <Key>Home: string(0x01)\n\
   <Key>End:  string(0x05)\n
-
 !BLK Cursor
 #define _color0        #ffffff
 #define _color8        #ffffff

vim/vimrc

@@ -93,7 +93,6 @@ vnoremap > >gv
 nnoremap <F1> <nop>
 inoremap <F1> <nop>
 vnoremap <F1> <nop>
-nnoremap <Leader>== yyPv$r=jyypv$r=
 nnoremap <Leader>** yyPv$r*jyypv$r*
 nnoremap <Leader>= yypv$r=
 nnoremap <Leader>- yypv$r-
@@ -303,6 +302,7 @@ Bundle 'Shougo/neocomplete.vim'
   "Autocompletes | https://github.com/Shougo/neocomplete.vim
 Bundle 'othree/eregex.vim'
   "Real regexes in vim | https://github.com/othree/eregex.vim
+  "Real regexes in vim | https://github.com/othree/eregex.vim
 Bundle 'vim-scripts/sessionman.vim'
   " |https://github.com/vim-scripts/sessionman.vim
 Bundle 'mattn/flappyvird-vim'