back to supertab, ycm ist not for me

gitconfig

@@ -40,6 +40,7 @@
   subup = submodule foreach git pull
   rs = reset HEAD --hard
   hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
+  l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
   lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
   pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
   type = cat-file -t

vim/snippets/css.snippets

@@ -58,7 +58,7 @@ snippet tra "compass transitions"
 @include transition(all ${1:0.3}s ease-in-out);$0
 endsnippet
 
-snippet frm "compass transforms"
+snippet traf "compass transforms"
 @include transform(${1:scale}(${2:1.1})); $0
 endsnippet
 
@@ -101,6 +101,10 @@ snippet bgf "background: complete"
 background:${6: ${1:\$color-main}} url(../img/$2) ${3:no-repeat} ${4:scroll/fixed} ${5:top left};$0
 endsnippet
 
+snippet bg "background"
+background: ${1:$color-background-default};
+endsnippet
+
 
 # borders
 
@@ -112,7 +116,7 @@ snippet bdt "border-top"
 border-top: ${1:1}px ${2:solid} ${3:$color-main};$0
 endsnippet
 
-snippet bdb "border-right"
+snippet bdr "border-right"
 border-right: ${1:1}px ${2:solid} ${3:\$color-main};$0
 endsnippet
 

vim/snippets/php.snippets

@@ -1,3 +1,6 @@
+extends html
+
+
 snippet arr "array"
 $${1:arrayName} = array('${2}' => ${3});${4}
 endsnippet

vimrc

@@ -16,22 +16,19 @@ Bundle 'Lokaltog/vim-easymotion'
 Bundle 'Lokaltog/vim-powerline'
 Bundle 'Raimondi/delimitMate'
 Bundle 'SirVer/ultisnips'
-Bundle 'Valloric/YouCompleteMe'
 Bundle 'chrisbra/NrrwRgn'
 Bundle 'editorconfig/editorconfig-vim'
 Bundle 'edsono/vim-matchit'
+Bundle 'ervandew/supertab'
 Bundle 'godlygeek/tabular'
 Bundle 'jeetsukumaran/vim-buffergator'
-Bundle 'kana/vim-textobj-user'
 Bundle 'kien/ctrlp.vim'
-Bundle 'kien/rainbow_parentheses.vim'
 Bundle 'mattn/gist-vim'
 Bundle 'mattn/webapi-vim'
 Bundle 'maxbrunsfeld/vim-yankstack'
 Bundle 'rking/ag.vim'
 Bundle 'scrooloose/nerdtree'
 Bundle 'scrooloose/syntastic'
-Bundle 'sjl/vitality.vim'
 Bundle 'tomtom/tcomment_vim'
 Bundle 'tpope/vim-abolish'
 Bundle 'tpope/vim-fugitive'
@@ -48,20 +45,14 @@ Bundle 'hail2u/vim-css3-syntax'
 Bundle 'juvenn/mustache.vim'
 Bundle 'othree/html5.vim'
 Bundle 'pangloss/vim-javascript'
-Bundle 'spf13/PIV'
 Bundle 'tpope/vim-git'
 Bundle 'tpope/vim-haml'
 Bundle 'webgefrickel/vim-typoscript'
 
 
 " Color themes
-Bundle 'Lokaltog/vim-distinguished'
-Bundle 'jaromero/vim-monokai-refined'
 Bundle 'nanotech/jellybeans.vim'
-Bundle 'zeis/vim-kolor'
-Bundle 'morhetz/gruvbox'
 Bundle 'altercation/vim-colors-solarized'
-Bundle 'wgibbs/vim-irblack'
 Bundle 'stephenmckinney/vim-solarized-powerline'
 
 
@@ -87,6 +78,7 @@ set listchars=extends:»,precedes:«,tab:▸\ ,eol:¬,trail:·
 
 " add the dash to keywords -- makes better css/js search
 set iskeyword+=-
+set iskeyword-=_
 
 " Tabs and Whitespace
 set tabstop=2
@@ -120,7 +112,7 @@ if &term =~ '^screen'
 endif
 
 
-let g:solarized_visibility = 'low'
+let g:solarized_contrast = 'high'
 set background=dark
 colorscheme solarized
 
@@ -260,8 +252,8 @@ nnoremap Q <nop>
 nnoremap K <nop>
 
 " upper/lower word
-nmap <leader>U mQviwU`Q
-nmap <leader>L mQviwu`Q
+nmap <leader>u mQviwU`Q
+nmap <leader>l mQviwu`Q
 
 " Swap two words
 nmap <leader>w :s/\(\%#\w\+\)\(\_W\+\)\(\w\+\)/\3\2\1/<CR>`'
@@ -297,7 +289,7 @@ nnoremap <leader>/ :TComment<CR>
 vnoremap <leader>/ :TComment<CR>
 inoremap <leader>/ <Esc>:TComment<CR>i
 
-" Tabularize
+" Tabularize a == think align
 nmap <Leader>a= :Tabularize /=<CR>
 vmap <Leader>a= :Tabularize /=<CR>
 nmap <Leader>a: :Tabularize /:<CR>
@@ -311,29 +303,6 @@ vmap <Leader>a<Bar> :Tabularize /<Bar><CR>
 " easymotion config leader m
 let g:EasyMotion_leader_key = '<leader>m'
 
-" YouCompleteMe Options
-let g:ycm_complete_in_comments = 1
-let g:ycm_min_num_of_chars_for_completion = 5
-let g:ycm_key_list_select_completion = ['<TAB>']
-let g:ycm_key_list_previous_completion = ['<S-TAB>']
-
-
-" UltiSnips ctrl-n if ycm is active
-function! g:UltiSnips_Complete()
-  call UltiSnips_ExpandSnippet()
-  if g:ulti_expand_res == 0
-    if pumvisible()
-      return "\<C-n>"
-    else
-      call UltiSnips_JumpForwards()
-      if g:ulti_jump_forwards_res == 0
-        return "\<TAB>"
-      endif
-    endif
-  endif
-  return ""
-endfunction
-
 au BufEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
 let g:UltiSnipsSnippetDirectories=["snippets"]
 let g:UltiSnipsExpandTrigger="<tab>"

zshrc

@@ -11,6 +11,9 @@ unsetopt correct_all
 # Terminal
 export TERM="screen-256color"
 
+# brew CASK
+export HOMEBREW_CASK_OPTS="--appdir=/Applications"
+
 # paths
 export PATH=/usr/local/bin:/usr/local/sbin:$HOME/.rvm/bin:$PATH
 export MANPATH=/usr/local/share/man:$MANPATH
@@ -58,9 +61,10 @@ alias v='vim'
 alias vd='vimdiff'
 alias diff='vimdiff'
 
-# easy hosts-editing
+# easy hosts / apache / php editing
 alias hosts='_ vim /etc/hosts'
 alias vhosts='_ vim /etc/apache2/extra/httpd-vhosts.conf'
+alias phpini='vim /usr/local/etc/php/5.4/php.ini'
 
 # Easier navigation: .., ..., ~ and -
 alias ..='cd ..'