vim cleanup, sneak + sasslint

install/_install.sh

@@ -51,6 +51,7 @@ ln -s ~/dotfiles/editorconfig ~/.editorconfig
 ln -s ~/dotfiles/eslintrc ~/.eslintrc
 ln -s ~/dotfiles/gitconfig ~/.gitconfig
 ln -s ~/dotfiles/gitignore ~/.gitignore
+ln -s ~/dotfiles/sass-lint.yml ~/.sass-lint.yml
 ln -s ~/dotfiles/slate.js ~/.slate.js
 ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 ln -s ~/dotfiles/vim ~/.vim
@@ -59,7 +60,6 @@ ln -s ~/dotfiles/zsh ~/.zsh
 ln -s ~/dotfiles/zshrc ~/.zshrc
 
 # set xterm/screen terminals to enable italic fonts in terminal
-ln -s ~/dotfiles/zsh/pure/pure.zsh /usr/local/share/zsh/site-functions/prompt_pure_setup
 tic ~/dotfiles/terminfo/xterm-256color.terminfo
 
 # set iterm terminal to xterm-256color and enable italics!

install/node.sh

@@ -16,5 +16,5 @@ npm install -g jsonlint
 npm install -g npm-check-updates
 npm install -g pure-prompt
 npm install -g recursive-blame
-npm install -g trash
+npm install -g trash-cli
 npm install -g vtop

sass-lint.yml

@@ -0,0 +1,25 @@
+options:
+  merge-default-rules: true
+
+files:
+  ignore:
+    - 'src/scss/vendor/*.scss'
+
+rules:
+  class-name-format:
+    - 1
+    - convention: hyphenatedbem
+  placeholder-name-format:
+    - 1
+    - convention: hyphenatedbem
+  nesting-depth:
+    - 1
+    - max-depth: 4
+  mixins-before-declarations:
+    - 1
+    - exclude: [ 'mediaquery', 'attention' ]
+  no-color-literals: 0
+  leading-zero: 0
+  property-sort-order: 0
+  force-pseudo-nesting: 0
+  space-around-operator: 0

tmux.conf

@@ -90,7 +90,7 @@ setw -g window-status-current-fg brightred
 setw -g window-status-current-bg default
 setw -g clock-mode-colour green
 
-# Custom status bar - with Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤
+# Custom status bar
 set -g status-left-length 32
 set -g status-right-length 150
 set -g status-interval 5
@@ -99,4 +99,3 @@ set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=c
 set -g status-right '#[fg=colour238,bg=default,nobold]#[fg=colour245,bg=colour238] #(whoami)@#h#[fg=colour252] #[fg=colour235,bg=colour252,bold] #(date +"%H:%M") '
 set -g window-status-format '#[fg=base0,bg=default] #I #W'
 set -g window-status-current-format '#[fg=black,bg=brightred]#[fg=colour251,bg=brightred,noreverse,bold] #I #W #[fg=brightred,bg=black,nobold]'
-

vim/config/plugins/lightline.vim

@@ -2,22 +2,22 @@
 "======================================================================
 
 let g:lightline = {
-      \ 'colorscheme': 'solarized_dark',
-      \ 'active': {
-      \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ],
-      \   'right': [ [ 'lineinfo' ], [ 'fileformat', 'fileencoding', 'filetype' ] ]
-      \ },
-      \ 'component_function': {
-      \   'modified': 'LightlineModified',
-      \   'readonly': 'LightlineReadonly',
-      \   'fugitive': 'LightlineFugitive',
-      \   'filename': 'LightlineFilename',
-      \   'fileformat': 'LightlineFileformat',
-      \   'filetype': 'LightlineFiletype',
-      \   'fileencoding': 'LightlineFileencoding',
-      \   'mode': 'LightlineMode',
-      \ }
-      \ }
+  \ 'colorscheme': 'solarized_dark',
+  \ 'active': {
+  \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ],
+  \   'right': [ [ 'lineinfo' ], [ 'fileformat', 'fileencoding', 'filetype' ] ]
+  \ },
+  \ 'component_function': {
+  \   'modified': 'LightlineModified',
+  \   'readonly': 'LightlineReadonly',
+  \   'fugitive': 'LightlineFugitive',
+  \   'filename': 'LightlineFilename',
+  \   'fileformat': 'LightlineFileformat',
+  \   'filetype': 'LightlineFiletype',
+  \   'fileencoding': 'LightlineFileencoding',
+  \   'mode': 'LightlineMode',
+  \ }
+  \ }
 
 function! LightlineModified()
   return &ft =~ 'help' ? '' : &modified ? 'ɱ' : &modifiable ? '' : 'ɯ'
@@ -29,9 +29,9 @@ endfunction
 
 function! LightlineFilename()
   return ('' != LightlineReadonly() ? LightlineReadonly() . ' ' : '') .
-        \ (&ft == 'unite' ? unite#get_status_string() :
-        \ '' != expand('%:t') ? expand('%:t') : '[No Name]') .
-        \ ('' != LightlineModified() ? ' ' . LightlineModified() : '')
+    \ (&ft == 'unite' ? unite#get_status_string() :
+    \ '' != expand('%:t') ? expand('%:t') : '[No Name]') .
+    \ ('' != LightlineModified() ? ' ' . LightlineModified() : '')
 endfunction
 
 function! LightlineFugitive()

vim/config/plugins/neocomplete.vim

@@ -9,11 +9,11 @@ let g:neocomplete#force_overwrite_completefunc = 1
 inoremap <expr><C-g> neocomplete#undo_completion()
 inoremap <expr><C-l> neocomplete#complete_common_string()
 inoremap <silent> <CR> <C-r>=<SID>neocomplete_cr_function()<CR>
-inoremap <expr><C-y>  neocomplete#close_popup()
-inoremap <expr><C-e>  neocomplete#cancel_popup()
+inoremap <expr><C-y> neocomplete#close_popup()
+inoremap <expr><C-e> neocomplete#cancel_popup()
 
 " <TAB>: completion.
-inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
+inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
 " " <C-h>, <BS>: close popup and delete backword char.
 inoremap <expr><C-h> neocomplete#smart_close_popup()."\<C-h>"
 inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>"

vim/config/plugins/neosnippet.vim

@@ -8,7 +8,7 @@ let g:neosnippet#scope_aliases['php'] = 'php,html'
 let g:neosnippet#snippets_directory = '~/.vim/bundle/vim-snippets/snippets'
 
 " Plugin key-mappings, expand with ctrl + j
-imap <C-j>     <Plug>(neosnippet_expand_or_jump)
-smap <C-j>     <Plug>(neosnippet_expand_or_jump)
-xmap <C-j>     <Plug>(neosnippet_expand_target)
+imap <C-j> <Plug>(neosnippet_expand_or_jump)
+smap <C-j> <Plug>(neosnippet_expand_or_jump)
+xmap <C-j> <Plug>(neosnippet_expand_target)
 

vim/config/plugins/sneak.vim

@@ -1,10 +1,7 @@
 " Vim sneak
 "======================================================================
 
-" let g:sneak#use_ic_scs = 1
-" let g:sneak#map_netrw = 0
-" let g:sneak#streak = 1
-" nmap <Bslash> <Plug>SneakNext
-" nmap \| <Plug>SneakPrevious
-" xmap <Bslash> <Plug>VSneakNext
-" xmap \| <Plug>VSneakPrevious
+let g:sneak#use_ic_scs = 0
+let g:sneak#map_netrw = 1
+let g:sneak#s_next = 1
+let g:sneak#streak = 1

vim/config/plugins/syntastic.vim

@@ -3,13 +3,11 @@
 
 " no checking for xhtml/html -- because of fluidtemplate for TYPO3
 " and no checking for scss.css because of CSS3 and SASS-Variable
-let g:syntastic_auto_jump = 0
-let g:syntastic_scss_scss_lint_exec = '/Users/webgefrickel/.rbenv/shims/scss-lint'
-let g:syntastic_scss_checkers = ['scss-lint']
 let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_json_checkers = ['jsonlint']
+let g:syntastic_auto_jump = 0
 let g:syntastic_mode_map = {
-      \ 'mode': 'active',
-      \ 'active_filetypes': ['php', 'scss', 'javascript', 'json'],
-      \ 'passive_filetypes': ['xhtml', 'html']
-      \ }
+  \ 'mode': 'active',
+  \ 'active_filetypes': ['php', 'javascript', 'json'],
+  \ 'passive_filetypes': ['xhtml', 'html']
+  \ }

vim/config/plugins/unite.vim

@@ -4,8 +4,8 @@
 let g:unite_prompt='❯ '
 let g:unite_source_grep_command='ag'
 let g:unite_source_grep_default_opts =
-      \ '-i --vimgrep --hidden --ignore ' .
-      \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
+  \ '-i --vimgrep --hidden --ignore ' .
+  \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
 let g:unite_source_grep_recursive_opt=''
 let g:unite_split_rule = "botright"
 let g:unite_force_overwrite_statusline = 0
@@ -15,16 +15,16 @@ call unite#filters#sorter_default#use(['sorter_rank'])
 call unite#set_profile('files', 'context.smartcase', 1)
 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',
-      \ '\.svn',
-      \ '\.sass-cache',
-      \ '_srcs',
-      \ 'node_modules',
-      \ 'bower_components',
-      \ 'vim\/bundle',
-      \ '\.\(png\|gif\|jpg\|pdf\|ico\|mp4\|webm\|mp3\|woff\|ttf\|eot\|min\.js\|min\.map\|css\)$',
-      \ ], '\|'))
+  \ 'ignore_pattern', join([
+  \ '\.git',
+  \ '\.svn',
+  \ '\.sass-cache',
+  \ '_srcs',
+  \ 'node_modules',
+  \ 'bower_components',
+  \ 'vim\/bundle',
+  \ '\.\(png\|gif\|jpg\|pdf\|ico\|mp4\|webm\|mp3\|woff\|ttf\|eot\|min\.js\|min\.map\|css\)$',
+  \ ], '\|'))
 
 nmap <space> [unite]
 nnoremap [unite] <nop>
@@ -42,8 +42,8 @@ autocmd FileType unite call s:unite_settings()
 
 function! s:unite_settings()
   nmap <buffer> <ESC> <Plug>(unite_exit)
-  imap <buffer> <C-j>   <Plug>(unite_select_next_line)
-  imap <buffer> <C-k>   <Plug>(unite_select_previous_line)
+  imap <buffer> <C-j> <Plug>(unite_select_next_line)
+  imap <buffer> <C-k> <Plug>(unite_select_previous_line)
   nmap <buffer> <C-r> <Plug>(unite_redraw)
   imap <buffer> <C-r> <Plug>(unite_redraw)
   inoremap <silent><buffer><expr> <C--> unite#do_action('split')

zsh/aliases

@@ -50,6 +50,7 @@ alias ggpnp='git pull origin $(current_branch) && git push origin $(current_bran
 alias gsmu='git submodule init && git submodule update'
 alias gsmuu='git submodule foreach git pull origin master'
 alias gsvn='git checkout master && git svn fetch && git merge dev && git svn rebase && git svn dcommit'
+alias ggall='git remote | xargs -L1 git push --all'
 alias gmo='$EDITOR $(git ls-files -m)'
 
 # aliases for apache and mysql