lots

.gitignore

@@ -1,3 +1,2 @@
 .netrwhist
-yankring_history_v2.txt
-vim/bundle/
+vim/bundle

agignore

@@ -1,43 +1,9 @@
-/_srcs/
-/node_modules/
-/.sass-cache/
+_srcs
+node_modules
+.sass-cache
 
 *.css
-*/*.css
-*/*/*.css
-*/*/*/*.css
-*/*/*/*/*.css
-*/*/*/*/*/*.css
-*/*/*/*/*/*/*.css
-
 *.min.css
-*/*.min.css
-*/*/*.min.css
-*/*/*/*.min.css
-*/*/*/*/*.min.css
-*/*/*/*/*/*.min.css
-*/*/*/*/*/*/*.min.css
-
 *.min.js
-*/*.min.js
-*/*/*.min.js
-*/*/*/*.min.js
-*/*/*/*/*.min.js
-*/*/*/*/*/*.min.js
-*/*/*/*/*/*/*.min.js
-
 *.min.map
-*/*.min.map
-*/*/*.min.map
-*/*/*/*.min.map
-*/*/*/*/*.min.map
-*/*/*/*/*/*.min.map
-*/*/*/*/*/*/*.min.map
-
 *.svg
-*/*.svg
-*/*/*.svg
-*/*/*/*.svg
-*/*/*/*/*.svg
-*/*/*/*/*/*.svg
-*/*/*/*/*/*/*.svg

aliases

@@ -83,7 +83,7 @@ alias upall='sysup && brewup && gemup && npmup'
 alias hosts='sudo vim /etc/hosts'
 alias vhosts='sudo vim /usr/local/etc/apache2/extra/httpd-vhosts.conf'
 alias phpini='vim /usr/local/etc/php/5.5/php.ini'
-alias http='vim /usr/local/etc/apache2/httpd.conf'
+alias httpconf='vim /usr/local/etc/apache2/httpd.conf'
 
 
 # vagrant stuff

gitconfig

@@ -58,3 +58,6 @@
 [mergetool]
   prompt = false
   keepBackup = false
+[user]
+	name = Steffen Rademacker
+	email = webgefrickel@gmail.com

gitignore

@@ -14,13 +14,13 @@
 .~lock*
 .tmp_*
 .sass-cache
-*.sass-cache
 .revision
 .rev
 _srcs
 log
 tmp
 node_modules
+bower_components
 
 # OS or editor folders and temporary and other files
 .DS_Store

install/node.sh

@@ -12,6 +12,7 @@ npm install -g browserify
 npm install -g dploy
 npm install -g grunt-cli
 npm install -g gulp
+npm install -g jscs
 npm install -g jshint
 npm install -g jsonlint
 npm install -g npm-check-updates

install/ruby.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
+gem install berkshelf --no-ri --no-rdoc
 gem install bundler --no-ri --no-rdoc
-gem install sass --no-ri --no-rdoc
 gem install capistrano --no-ri --no-rdoc
+gem install chef --no-ri --no-rdoc
 gem install compass --pre --no-ri --no-rdoc
+gem install sass --no-ri --no-rdoc
 gem install scss-lint --no-ri --no-rdoc
-gem install chef --no-ri --no-rdoc
-gem install berkshelf --no-ri --no-rdoc

tmux.conf

@@ -61,10 +61,10 @@ bind-key l select-pane -R
 
 
 # Mouse support
-set -g mouse-select-pane on
-set -g mouse-select-window on
-set -g mouse-resize-pane on
-setw -g mode-mouse on
+set -g mode-mouse on
+set-option -g mouse-select-pane on
+set-option -g mouse-select-window on
+set-option -g mouse-resize-pane on
 
 # counting panes starts at 1
 set -g base-index 1

vimrc

@@ -36,7 +36,6 @@ NeoBundle 'edsono/vim-matchit'
 NeoBundle 'gcmt/wildfire.vim'
 NeoBundle 'godlygeek/tabular'
 NeoBundle 'justinmk/vim-sneak'
-NeoBundle 'mattn/emmet-vim'
 NeoBundle 'moll/vim-node'
 NeoBundle 'scrooloose/nerdtree'
 NeoBundle 'scrooloose/syntastic'
@@ -107,6 +106,7 @@ set sidescroll=10                          " smoother side-scrolling
 set sidescrolloff=5                        " jump by 5 when scrolling sideways
 set timeout timeoutlen=800 ttimeoutlen=100 " get rid of the delay when pressing O (for example)
 set ttyfast                                " faster terminal usage
+set ttymouse=xterm2                        " xterm/tmux compatible mouse
 set virtualedit=all                        " every mode active from v V to StrgV
 set visualbell                             " don't flicker
 
@@ -220,26 +220,23 @@ endfunction
 au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"" | endif
 
 " spell correction on text-files
-au BufRead,BufNewFile *.{md|rst} setlocal spell
+au BufRead,BufNewFile *.md setlocal spell
 
 " add the dash to keywords -- makes better css/js/html search
 " do this for specific files only (not in php/rb e.g.)
-" TODO check if this is sane at all
-au BufNewFile,BufRead *.{json,js,css,scss,html} set iskeyword+=-
-au BufNewFile,BufRead *.{json,js,css,scss,html} set iskeyword-=_
+au BufNewFile,BufRead *.{js,scss,html} set iskeyword+=-
+au BufNewFile,BufRead *.{js,scss,html} set iskeyword-=_
+au BufNewFile,BufRead *.php set iskeyword-=-
 
 " scss.css snippets and stuff
-au BufNewFile,BufRead *.{scss} set ft=scss.css
+au BufNewFile,BufRead *.scss set ft=scss.css
 
 " Syntaxes for other files
 au BufNewFile,BufRead *.twig set ft=html.twig
 
-" load emmet for html-files
-au FileType html,php,twig,mustache EmmetInstall
-
 " omnicompletion for some filetypes
 au FileType css,scss setlocal omnifunc=csscomplete#CompleteCSS
-au FileType html,php,twig,mustache setlocal omnifunc=htmlcomplete#CompleteTags
+au FileType html,php,twig setlocal omnifunc=htmlcomplete#CompleteTags
 au FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
 au FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
 
@@ -422,11 +419,13 @@ endif
 " and no checking for scss.css because of CSS3 and SASS-Variable
 let g:syntastic_auto_jump = 0
 let g:syntastic_scss_checkers = ['scss_lint']
+let g:syntastic_javascript_checkers = ['jshint', 'jscs']
+let g:syntastic_json_checkers = ['jsonlint']
 let g:syntastic_mode_map = {
-      \ 'mode': 'active',
-      \ 'active_filetypes': ['php', 'javascript', 'scss'],
-      \ 'passive_filetypes': ['xhtml', 'html']
-      \ }
+  \ 'mode': 'active',
+  \ 'active_filetypes': ['php', 'javascript', 'scss', 'json'],
+  \ 'passive_filetypes': ['xhtml', 'html']
+  \ }
 
 
 " airline config
@@ -435,11 +434,6 @@ let g:airline_left_sep = '▶'
 let g:airline_right_sep = '◀'
 
 
-" EMMET deactivate emmet by default
-let g:user_emmet_install_global = 0
-imap <expr> <C-e> emmet#expandAbbrIntelligent("\<C-e>")
-
-
 " wildfire
 let g:wildfire_objects = ['i"', "i'", "i)", "i]", "i}", "iW", "it", "ip"]
 let g:wildfire_fuel_map = "<ENTER>"
@@ -497,9 +491,10 @@ call unite#custom#source('line,outline', 'matchers', 'matcher_fuzzy')
 call unite#custom_source('file_rec, file_rec/async, file_mru, file, buffer, grep',
       \ 'ignore_pattern', join([
       \ '\.git',
-      \ '.sass-cache',
+      \ '\.sass-cache',
       \ '_srcs',
       \ 'node_modules',
+      \ 'bower_components',
       \ 'tmp',
       \ '\.\(png\|gif\|jpg\|pdf\|ico\|mp4\|webm\|svg\|mp3\|woff\|ttf\|eot\|min\.js\|min\.map\|css\)$',
       \ ], '\|'))