Add notion and some other stuff

.vimrc

@@ -14,7 +14,7 @@ Plugin 'tpope/vim-fugitive'
 Plugin 'shougo/neocomplete.vim'
 " Plugin 'Valloric/YouCompleteMe'
 " Plugin 'Shougo/unite.vim'
-Plugin 'ervandew/supertab'
+" Plugin 'ervandew/supertab'
 
 "
 Plugin 'terryma/vim-multiple-cursors'
@@ -41,9 +41,19 @@ Plugin 'jistr/vim-nerdtree-tabs'
 Plugin 'vim-scripts/SearchComplete'
 Plugin 'MarcWeber/vim-addon-mw-utils'
 Plugin 'vim-scripts/tlib'
-Plugin 'garbas/vim-snipmate'
-Plugin 'honza/vim-snippets'
+
+" Snippets
+" Plugin 'garbas/vim-snipmate'
+" Plugin 'honza/vim-snippets'
+Plugin 'Shougo/neosnippet'
+Plugin 'Shougo/neosnippet-snippets'
+
 Plugin 'vim-scripts/taglist.vim'
+
+" Appearance
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
+
 " Langs
 Plugin 'kchmck/vim-coffee-script'
 Plugin 'slim-template/vim-slim'
@@ -108,12 +118,49 @@ let g:nerdtree_tabs_open_on_gui_startup = 0
 let g:nerdtree_tabs_autoclose = 0
 
 " Snipmate
-imap <S-Enter> <Plug>snipMateNextOrTrigger
+" imap <S-Enter> <Plug>snipMateNextOrTrigger
+" let g:snipMate = get(g:, 'snipMate', {}) " Allow for vimrc re-sourcing
 
 " YouCompleteMe
 " let g:ycm_key_list_select_completion = ['<TAB>']
 " let g:ycm_key_list_previous_completion = ['<S-TAB>']
 
+" Neocomplete
+let g:acp_enableAtStartup = 0
+let g:neocomplete#enable_at_startup = 1
+let g:neocomplete#enable_smart_case = 1
+let g:neocomplete#max_list = 10
+let g:neocomplete#sources#syntax#min_keyword_length = 3
+inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
+
+autocmd FileType ruby setlocal omnifunc=rubycomplete#Complete
+
+" Neocomplete snippets
+imap <C-k>     <Plug>(neosnippet_expand_or_jump)
+smap <C-k>     <Plug>(neosnippet_expand_or_jump)
+xmap <C-k>     <Plug>(neosnippet_expand_target)
+
+" SuperTab like snippets behavior.
+" Note: It must be "imap" and "smap".  It uses <Plug> mappings.
+imap <C-k>     <Plug>(neosnippet_expand_or_jump)
+"imap <expr><TAB>
+" \ pumvisible() ? "\<C-n>" :
+" \ neosnippet#expandable_or_jumpable() ?
+" \    "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
+smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+\ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
+
+" For conceal markers.
+if has('conceal')
+  set conceallevel=2 concealcursor=niv
+endif
+
+" Enable snipMate compatibility feature.
+let g:neosnippet#enable_snipmate_compatibility = 1
+"
+" Tell Neosnippet about the other snippets
+let g:neosnippet#snippets_directory='~/.vim/bundle/vim-snippets/snippets'
+
 " Syntastic
 " let g:syntastic_ruby_checkers = ['mri']
 "let g:syntastic_shell = "/bin/sh"
@@ -128,8 +175,6 @@ imap <S-Enter> <Plug>snipMateNextOrTrigger
 "let g:syntastic_check_on_open = 0
 "let g:syntastic_check_on_wq = 1
 
-let g:snipMate = get(g:, 'snipMate', {}) " Allow for vimrc re-sourcing
-
 " Ack
 let g:ack_use_dispatch = 0
 
@@ -155,13 +200,15 @@ au BufRead,BufNewFile *.vue setf coffee " riotjs tags
 
 " silent! nmap <C-f> :FufLine<CR>
 " silent! nmap <C-g> :FufCoverageFile<CR>
-"let g:airline_theme = 'gotham'
-"let g:airline_left_sep = '▶'                      " Set custom left separator
-"let g:airline_right_sep = '◀'                     " Set custom right separator
-"let g:airline#extensions#tabline#enabled = 1      " Enable airline for tab-bar
+"
+" Airline
+let g:airline_theme      = 'solarized'
+let g:airline_section_y  = ''  " Don't display encoding
+let g:airline_left_sep   = '▶' " Set custom left separator
+let g:airline_right_sep  = '◀' " Set custom right separator
+"let g:airline#extensions#tabline#enabled      = 1      " Enable airline for tab-bar
 "let g:airline#extensions#tabline#show_buffers = 0 " Don't display buffers in tab-bar with single tab
-"let g:airline#extensions#tabline#fnamemod = ':t'  " Display only filename in tab
-"let g:airline_section_y = ''                      " Don't display encoding
+"let g:airline#extensions#tabline#fnamemod     = ':t'  " Display only filename in tab
 
 " Vim gitgutter
 let g:gitgutter_sign_added = '█'
@@ -197,6 +244,7 @@ autocmd BufWritePre *.* :call <SID>StripTrailingWhitespaces()
 set noswapfile
 set background=dark
 " colorscheme coldrails
+set t_Co=256
 colorscheme solarized
 call togglebg#map("<F5>")
 
@@ -223,6 +271,12 @@ set incsearch
 set hlsearch   " Highlight searches
 set ruler              " Ruler on
 
+set colorcolumn=+1
+
+set re=1
+" set ttyfast
+" set lazyredraw
+
 set nocp incsearch
 " Search
 " set ignorecase " Ignore case of searches
@@ -255,21 +309,21 @@ set laststatus=2 " Always show status line.
 set list                    " show invisibles
 set listchars=tab:▸\ ,eol:¬
 
-if has("gui_running")
-  set go-=m " remove menu bar
-  set go-=T " remove toolbar
-  set go-=r " remove right-hand scroll bar
-  set go-=e " remove gui tabs
-  set go-=L " remove left-hand scroll bar
+" inoremap  <Up>     <NOP>
+" inoremap  <Down>   <NOP>
+" inoremap  <Left>   <NOP>
+" inoremap  <Right>  <NOP>
+noremap   <Up>     <NOP>
+noremap   <Down>   <NOP>
+noremap   <Left>   <NOP>
+noremap   <Right>  <NOP>
 
-  let g:miniBufExplMapWindowNavVim = 1
-  let g:miniBufExplMapWindowNavArrows = 1
-  let g:miniBufExplMapCTabSwitchBufs = 1
-  let g:miniBufExplModSelTarget = 1
+" Open new split panes to right and bottom, which feels more natural
+set splitbelow
+set splitright
 
-  set guifont=Terminus\ 10
-
-  " gvim specific
-  set mousehide    " Hide mouse after chars typed
-  set mouse-=a     " Mouse in all modes
-end " end for guichecking if
+" Quicker window movement
+nnoremap <C-j> <C-w>j
+nnoremap <C-k> <C-w>k
+nnoremap <C-h> <C-w>h
+nnoremap <C-l> <C-w>l