FASD, vim + install cleanup

aliases

@@ -17,11 +17,17 @@ alias ..='cd ..'
 alias ...='cd ../..'
 alias ....='cd ../../..'
 alias .....='cd ../../../..'
-alias e='exit'
-alias md='mkdir -p'
-alias rd=rmdir
-alias d='dirs -v | head -10'
-
+alias q='exit'
+
+# fasd
+alias a='fasd -a'        # any
+alias s='fasd -si'       # show / search / select
+alias d='fasd -d'        # directory
+alias f='fasd -f'        # file
+alias sd='fasd -sid'     # interactive directory selection
+alias sf='fasd -sif'     # interactive file selection
+alias z='fasd_cd -d'     # cd, same functionality as j in autojump
+alias zz='fasd_cd -d -i' # cd with interactive selection
 
 # suffix-aliases for file-types (zsh only)
 alias -s css=vim

exports

@@ -37,3 +37,4 @@ export LESS="-R"
 export LC_CTYPE=$LANG
 
 export RBENV_VERSION="2.1.3"
+export DOCKER_HOST=tcp://192.168.59.103:2376

functions

@@ -11,7 +11,7 @@ function tmd() {
   tmux new-window -n templates -d
   tmux send-keys -t scss 'cd source/scss && vim' Enter
   tmux send-keys -t js 'cd source/js && vim' Enter
-  tmux send-keys -t templates 'cd public && vim' Enter
+  tmux send-keys -t templates 'cd public && ls' Enter
   tmux select-window -t gitngulp
   tmux select-pane -t 2
   tmux send-keys -t gitngulp 'gulp' Enter
@@ -22,10 +22,7 @@ function fname() {
   find . -iname "*$@*";
 }
 
-function schalala() {
-}
-
-
+# create and change to directory/folder
 function take() {
   mkdir -p $1
   cd $1
@@ -54,7 +51,6 @@ function current_branch() {
 # creates an archive from given directory
 mktar() { tar cvf  "${1%%/}.tar" "${1%%/}"; }
 mktgz() { tar cvzf "${1%%/}.tgz" "${1%%/}"; }
-mktbz() { tar cvjf "${1%%/}.tbz" "${1%%/}"; }
 mkzip() { zip -r   "${1%%/}"     "${1%%/}"; }
 
 

install/_install.sh

@@ -9,8 +9,7 @@ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
 brew doctor
 
 # tap the casks
-brew tap caskroom/homebrew-cask
-brew tap caskroom/versions
+brew install caskroom/cask/brew-cask
 
 # brew paths
 export HOMEBREW_CASK_OPTS="--appdir=/Applications"
@@ -26,6 +25,8 @@ brew install tmux
 brew install the_silver_searcher
 brew install wget
 brew install zsh
+brew install docker
+brew install boot2docker
 
 brew cask install dropbox
 brew cask install forklift

install/brew.sh

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
 brew tap homebrew/dupes
-brew tap josegonzalez/homebrew-php
-brew tap thoughtbot/formulae
+brew tap homebrew/php
 
 # install additional brew packages -- see _install.sh too
 brew install curl
@@ -13,7 +12,6 @@ brew install httpd
 brew install imagemagick
 brew install markdown
 brew install mysql
-brew install node --without-npm
 brew install php55
 brew install php55-mcrypt
 brew install php55-xdebug
@@ -22,7 +20,6 @@ brew install composer
 brew install rbenv
 brew install ruby-build
 brew install ssh-copy-id
-brew install subversion
 brew install unrar
 brew install youtube-dl
 
@@ -31,12 +28,10 @@ brew cask install adium
 brew cask install alfred
 brew cask install amadeus-pro
 brew cask install bartender
-brew cask install betterzipql
 brew cask install carbon-copy-cloner
 brew cask install doxie
 brew cask install firefox
 brew cask install flux
-brew cask install ghostlab
 brew cask install google-chrome
 brew cask install google-chrome-canary
 brew cask install imagealpha
@@ -44,8 +39,6 @@ brew cask install imageoptim
 brew cask install istat-menus
 brew cask install karabiner
 brew cask install libreoffice
-brew cask install miro-video-converter
-brew cask install opera
 brew cask install qlcolorcode
 brew cask install qlmarkdown
 brew cask install qlstephen

vimrc

@@ -18,7 +18,6 @@ NeoBundleFetch 'Shougo/neobundle.vim'
 "======================================================================
 
 NeoBundle "Chiel92/vim-autoformat"
-NeoBundle 'AndrewRadev/splitjoin.vim'
 NeoBundle 'Shougo/neocomplete'
 NeoBundle 'Shougo/neosnippet'
 NeoBundle 'Shougo/unite.vim'
@@ -247,6 +246,7 @@ au BufNewFile,BufRead *.twig set ft=html.twig
 " omnicompletion for some filetypes
 au FileType css,scss setlocal omnifunc=csscomplete#CompleteCSS
 au FileType html,php,twig setlocal omnifunc=htmlcomplete#CompleteTags
+au FileType php setlocal omnifunc=phpcomplete#CompletePHP
 au FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
 au FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
 
@@ -399,13 +399,6 @@ nmap <Leader>t, :Tabularize /,<CR>
 vmap <Leader>t, :Tabularize /,<CR>
 
 
-" Splitjoin
-let g:splitjoin_split_mapping = ''
-let g:splitjoin_join_mapping = ''
-nmap <Leader>sj :SplitjoinJoin<cr>
-nmap <Leader>sk :SplitjoinSplit<cr>
-
-
 " TComment
 nnoremap <leader>/ :TComment<CR>
 vnoremap <leader>/ :TComment<CR>
@@ -570,9 +563,8 @@ nnoremap [unite] <nop>
 
 nnoremap <silent> [unite], :<C-u>Unite -start-insert -toggle -auto-resize file_rec/async<cr>
 nnoremap <silent> [unite]b :<C-u>Unite -short-source-names -quick-match buffer<cr>
-nnoremap <silent> [unite]n :<C-u>Unite -toggle -auto-resize file<cr>
 nnoremap <silent> [unite]. :<C-u>Unite -start-insert -auto-resize buffer<cr>
-nnoremap <silent> [unite]l :<C-u>Unite -auto-resize line<cr>
+nnoremap <silent> [unite]l :<C-u>Unite -start-insert -auto-resize line<cr>
 nnoremap <silent> [unite]y :<C-u>Unite history/yank<cr>
 nnoremap <silent> [unite]f :<C-u>UniteWithCursorWord -start-insert -toggle -auto-resize file_rec/async<cr>
 nnoremap <silent> [unite]a :<C-u>Unite grep:.<cr>

zshrc

@@ -62,5 +62,8 @@ autoload colors; colors;
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 eval `gdircolors $HOME/dotfiles/zsh/dircolors-solarized/dircolors.256dark`
 
+# fasd
+eval "$(fasd --init auto)"
+
 # rbenv
 if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi