jaemskyle · October 27, 2014 20:27 · Oct 27, 2014 · Oct 27, 2014
diff --git a/vimrc_mac b/vimrc_mac
@@ -1,15 +1,3 @@
-set runtimepath+=~/.vim_runtime
-
-source ~/.vim_runtime/vimrcs/basic.vim
-source ~/.vim_runtime/vimrcs/filetypes.vim
-source ~/.vim_runtime/vimrcs/plugins_config.vim
-source ~/.vim_runtime/vimrcs/extended.vim
-
-try
-source ~/.vim_runtime/my_configs.vim
-catch
-endtry
-
 set number
 
 " Folding

diff --git a/vimrc_mac b/vimrc_mac
@@ -0,0 +1,130 @@
+set runtimepath+=~/.vim_runtime
+
+source ~/.vim_runtime/vimrcs/basic.vim
+source ~/.vim_runtime/vimrcs/filetypes.vim
+source ~/.vim_runtime/vimrcs/plugins_config.vim
+source ~/.vim_runtime/vimrcs/extended.vim
+
+try
+source ~/.vim_runtime/my_configs.vim
+catch
+endtry
+
+set number
+
+" Folding
+augroup vimrc
+  au BufReadPre * setlocal foldmethod=indent
+  au BufWinEnter * if &fdm == 'indent' | setlocal foldmethod=manual | endif
+augroup END
+
+" set smartindent 
+set tabstop=2
+set shiftwidth=2 
+set expandtab
+
+" VIM AIRLINE
+set guifont=Droid\ Sans\ Mono\ for\ Powerline:h12
+let g:airline#extensions#tabline#enabled = 1
+" let g:airline#extensions#tabline#buffer_idx_mode = 1
+nmap <leader>1 <Plug>AirlineSelectTab1
+nmap <leader>2 <Plug>AirlineSelectTab2
+nmap <leader>3 <Plug>AirlineSelectTab3
+nmap <leader>4 <Plug>AirlineSelectTab4
+nmap <leader>5 <Plug>AirlineSelectTab5
+nmap <leader>6 <Plug>AirlineSelectTab6
+nmap <leader>7 <Plug>AirlineSelectTab7
+nmap <leader>8 <Plug>AirlineSelectTab8
+nmap <leader>9 <Plug>AirlineSelectTab9
+
+let g:airline_symbols.linenr = '␊'
+let g:airline_symbols.linenr = '␤'
+let g:airline_symbols.linenr = '¶'
+let g:airline_symbols.branch = '⎇'
+let g:airline_symbols.paste = 'ρ'
+let g:airline_symbols.paste = 'Þ'
+let g:airline_symbols.paste = '∥'
+let g:airline_symbols.whitespace = 'Ξ'
+let g:airline_powerline_fonts = 1
+
+" powerline symbols
+  let g:airline_left_sep = ''
+  let g:airline_left_alt_sep = ''
+  let g:airline_right_sep = ''
+  let g:airline_right_alt_sep = ''
+  let g:airline_symbols.branch = ''
+  let g:airline_symbols.readonly = ''
+  let g:airline_symbols.linenr = ''
+
+" enable modified detection
+let g:airline_detect_modified=1
+
+if has('gui_running')
+    set background=light
+else
+    set background=dark
+    colorscheme ir_black
+endif
+
+syntax enable
+" set background=light
+colorscheme solarized
+
+
+let g:UltiSnipsSnippetDirectories= ["UltiSnips"]
+let g:UltiSnipsExpandTrigger = '<C-Tab>'
+
+let g:user_emmet_leader_key='<C-Z>'              
+
+let g:used_javascript_libs = 'angularjs'
+let loaded_matchit = 1
+
+" remove F1 default help
+inoremap <F1> <nop>
+nnoremap <F1> <nop>
+vnoremap <F1> <nop>
+
+
+" C-q to escape from all modes
+" vimbits
+inoremap <C-q> <Esc>
+noremap <C-q> <Esc>
+vnoremap <C-q> <Esc>
+cmap <C-q> <C-c>
+
+" select all
+map <Leader>a ggVG
+
+" insert space before and after
+" while and without leaving normal mode
+nmap t o<ESC>k
+nmap T O<ESC>j
+
+
+" move cursor while in insert mode
+imap <C-h> <C-o>h
+imap <C-j> <C-o>j
+imap <C-k> <C-o>k
+imap <C-l> <C-o>l
+
+
+" move through tabs with:
+map <s-l> :tabnext<cr>
+map <s-h> :tabprevious<cr>
+
+
+" remap U to <C-r> for easier redo
+nnoremap U <C-r>
+
+
+" resize splits with arrow keys
+noremap <c-up> <c-w>+
+noremap <c-down> <c-w>-
+noremap <c-left> <c-w>>
+noremap <c-right> <c-w><
+
+
+" disable help when pressing f1
+map <F1> <Esc>
+imap <F1> <Esc>
+