Add some bin files

Add selenium server
change some vim plugins

.directory

@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2016,11,20,7,37,13
+Version=3
+
+[Settings]
+HiddenFilesShown=true

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "dotfiles/vim/bundle/auto-pairs"]
 	path = dotfiles/vim/bundle/auto-pairs
 	url = git://github.com/jiangmiao/auto-pairs.git
-[submodule "dotfiles/vim/bundle/browserlink.vim"]
-	path = dotfiles/vim/bundle/browserlink.vim
-	url = git://github.com/jaxbot/browserlink.vim.git
 [submodule "dotfiles/vim/bundle/calendar.vim"]
 	path = dotfiles/vim/bundle/calendar.vim
 	url = https://github.com/itchyny/calendar.vim
@@ -64,3 +61,9 @@
 [submodule "dotfiles/vim/bundle/vmustache"]
 	path = dotfiles/vim/bundle/vmustache
 	url = https://github.com/tobyS/vmustache.git
+[submodule "dotfiles/vim/bundle/ultisnips"]
+	path = dotfiles/vim/bundle/ultisnips
+	url = https://github.com/SirVer/ultisnips.git
+[submodule "dotfiles/vim/bundle/vim-airline-themes"]
+	path = dotfiles/vim/bundle/vim-airline-themes
+	url = https://github.com/vim-airline/vim-airline-themes.git

dotfiles/.directory

@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2016,11,18,5,34,12
+Version=3
+
+[Settings]
+HiddenFilesShown=true

dotfiles/Xresources

@@ -5,7 +5,7 @@ xterm*faceName: DejaVu Sans Mono Book
 xterm*faceSize: 10
 
 ! Every shell is a login shell by default (for inclusion of all necessary environment variables)
-xterm*loginshell: true
+!xterm*loginshell: true
 
 ! I like a LOT of scrollback...
 xterm*savelines: 16384

dotfiles/bin/a2restart

@@ -0,0 +1,3 @@
+! /bin/bash
+
+sudo service apache2 restart 

dotfiles/bin/kdeclipboard

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Access your KDE 4 klipper on the command line
+# usage:
+#  ./clipboard
+#    will output current contents of klipper
+#  echo "foobar" | ./clipboard
+#    will put "foobar" into your clipboard/klipper
+
+# check for stdin
+if ! tty -s && stdin=$(</dev/stdin) && [[ "$stdin"  ]]; then
+    # get the rest of stdin
+    stdin=$stdin$'\n'$(cat)
+    # oh, nice - user input! we set that as current
+    # clipboard content
+    qdbus org.kde.klipper /klipper setClipboardContents "$stdin"
+    exit
+fi
+
+# if we reach this point no user input was given and we
+# print out the current contents of the clipboard
+qdbus org.kde.klipper /klipper getClipboardContents

dotfiles/bin/tmux-gendev

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+tmux new-window
+
+tmux rename-window 'General Dev'
+
+tmux send-keys "vim" C-m
+
+
+tmux split-window -h
+tmux send-keys "Server And Watch"
+
+tmux split-window -h
+tmux send-keys "General Terminal"
+
+tmux select-layout "5a9e,283x65,0,0{175x65,0,0,0,107x65,176,0[107x32,176,0,1,107x32,176,33,3]}"

dotfiles/bin/tmux-mysql

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+tmux new-window
+tmux rename-window 'MySql'
+tmux send-keys "mysql -uroot -proot" C-m
+tmux send-keys "pager vim -" C-m
+tmux split-window -h

dotfiles/bin/tmux-phpservers

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+tmux new-window
+tmux rename-window 'Servers'
+
+tmux send-keys "php -S http://localhost:8080"
+
+tmux split-window -h
+
+tmux send-keys "cd ~/.selenium-server" C-m
+tmux send-keys "java -jar ~/.selenium-server/selenium-server-standalone-2.53.1.jar -Dwebdriver.chrome.drive=chromedriver"

dotfiles/vimrc

@@ -1,4 +1,3 @@
-
 " important
 " --------------------------------------------------------------------------------
 call pathogen#infect()
@@ -9,6 +8,7 @@ set t_Co=256
 " --------------------------------------------------------------------------------
 " not sorted
 " --------------------------------------------------------------------------------
+autocmd BufNewFile,BufRead *.phtml   set ft=html
 " --------------------------------------------------------------------------------
 
 " --------------------------------------------------------------------------------
@@ -29,6 +29,7 @@ set rnu
 " highlighting and spelling
 " --------------------------------------------------------------------------------
 set cursorline
+syntax on
 " --------------------------------------------------------------------------------
 " multiple windows
 " --------------------------------------------------------------------------------
@@ -43,7 +44,7 @@ set title
 " --------------------------------------------------------------------------------
 " using the mouse
 " --------------------------------------------------------------------------------
-set mouse=a
+"set mouse=a
 " --------------------------------------------------------------------------------
 " printing
 " --------------------------------------------------------------------------------
@@ -84,6 +85,7 @@ inoremap EE <esc>$a
 inoremap ;;  <esc>$a;
 inoremap jj <esc>:w<cr>
 nnoremap <Leader>p :set paste<CR>o<esc>"*]p:set nopaste<cr>"
+nnoremap <Leader>b :ls<CR>:b
 nmap <silent> <Leader>o :NERDTreeToggle<CR>
 nmap <silent> <Leader>s ]sz=
 nmap <Leader>r :BLReloadPage<cr>
@@ -126,6 +128,10 @@ set encoding=utf-8
 "  plugins
 " --------------------------------------------------------------------------------
 
+" php complete
+let $PATH=$PATH . ':' . expand('~/.config/composer/vendor/bin')
+let g:padawan#composer_command = "composer"
+
 " ultisnips
 let g:UltiSnipsSnippetsDir = "~/.vim/UltiSnips"
 let g:snips_author = "AdeAttwood"
@@ -133,8 +139,8 @@ let g:snips_email = "attwood16@gmail.com"
 
 " vimwiki
 let g:vimwiki_list = [{
-\ 'path': '$HOME/ownCloud/vimwiki/',
+\ 'path': '$HOME/vimwiki/',
-\ 'template_path': '$HOME/ownCloud/vimwiki/templates',
+\ 'template_path': '$HOME/vimwiki/templates',
 \ 'template_default': 'default',
 \ 'template_ext': '.html',
 \ 'auto_toc': 1}]
@@ -158,6 +164,7 @@ autocmd FileType calendar nmap <buffer> <CR> :<C-u>call vimwiki#diary#calendar_a
 
 " vim-airline
 let g:airline#extensions#branch#enabled=1
+let g:airline_theme='bubblegum'
 
 " browserlink
 let g:bl_pagefiletype = ['html', 'javascript', 'css', 'scss', 'sass', 'php', 'phtml']
@@ -170,6 +177,3 @@ let g:indent_guides_auto_colors = 1
 " --------------------------------------------------------------------------------
 "  functions
 " --------------------------------------------------------------------------------
-
-
-

dotfiles/zshrc

@@ -0,0 +1,91 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+  export ZSH=/home/ade/.oh-my-zsh
+
+# Set name of the theme to load. Optionally, if you set this to "random"
+# it'll load a random theme each time that oh-my-zsh is loaded.
+# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+#ZSH_THEME="robbyrussell"
+#ZSH_THEME="bira"
+#ZSH_THEME="crunch"
+ZSH_THEME="awesomepanda"
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion. Case
+# sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git composer tmux debian)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/rsa_id"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+#
+#map ecs to caps lock
+xmodmap -e 'clear Lock' -e 'keycode 0x42 = Escape'

install/install_unix.sh

@@ -6,6 +6,7 @@ ln -sf ~/.dotfiles/dotfiles/bashrc ~/.bashrc
 ln -sf ~/.dotfiles/dotfiles/tmux.conf ~/.tmux.conf
 ln -sf ~/.dotfiles/dotfiles/vimrc ~/.vimrc
 ln -sf ~/.dotfiles/dotfiles/Xresources ~/.Xresources
+ln -sf ~/.dotfiles/dotfiles/zshrc ~/.zshrc
 
 # Link to the tmuxinator dir
 rm -rf ~/.tmuxinator
@@ -18,6 +19,10 @@ sudo ln -sf ~/.dotfiles/dotfiles/bin/* /usr/local/bin
 mkdir -p ~/.vim/autoload
 ln -sf ~/.dotfiles/dotfiles/vim/autoload/pathogen.vim ~/.vim/autoload/pathogen.vim
 
+# selenium server
+rm -rf ~/.selenium-server
+ln -sf ~/.dotfiles/dotfiles/selenium-server ~/.selenium-server
+
 # Install vim plugins
 rm -rf ~/.vim/bundle
 mkdir -p ~/.vim/bundle