Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Major Changes

  • Loading branch information...
commit 31170205ec093da00134e4c2a7a95e1bcf479d94 1 parent 13f9b8e
@jason-riddle authored
Showing with 201 additions and 262 deletions.
  1. +0 −1  .vim/bundle/vundle
  2. +0 −3  .vim/plugin/autohighlight.vim
  3. +0 −255 .vimrc
  4. 0  .bash_aliases → bash_aliases
  5. 0  .profile → bash_profile
  6. 0  .bashrc → bashrc
  7. 0  .brew → brew
  8. 0  .elementary → elementary
  9. 0  .gitconfig → gitconfig
  10. 0  .gvimrc → gvimrc
  11. 0  .osx → osx
  12. 0  .bash_profile → profile
  13. 0  .tmux.conf → tmux.conf
  14. 0  {.vim/bundle → vim/backups}/.gitkeep
  15. 0  {.vim → vim}/bin/ctags
  16. 0  {.vim → vim}/bin/ctags.exe
  17. +3 −3 {.vim → vim}/colors/Monokai.vim
  18. 0  {.vim → vim}/plugin/autoload_cscope.vim
  19. 0  {.vim → vim}/plugin/hicursorwords.vim
  20. +3 −0  vim/settings.vim
  21. +4 −0 vim/settings/NERDtree-tabs.vim
  22. +18 −0 vim/settings/NERDtree.vim
  23. +26 −0 vim/settings/airline.vim
  24. +4 −0 vim/settings/bufferline.vim
  25. +29 −0 vim/settings/ctrlp.vim
  26. +8 −0 vim/settings/easymotion.vim
  27. +5 −0 vim/settings/nerdcommenter.vim
  28. +27 −0 vim/settings/syntastic.vim
  29. +20 −0 vim/settings/tagbar.vim
  30. +13 −0 vim/settings/ycm.vim
  31. +26 −0 vim/vundles.vim
  32. +2 −0  vim/vundles/git.vundle
  33. +5 −0 vim/vundles/search.vundle
  34. +8 −0 vim/vundles/vim-improvements.vundle
  35. 0  .zsh_aliases → zsh_aliases
  36. 0  .zshrc → zshrc
1  .vim/bundle/vundle
@@ -1 +0,0 @@
-Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e
View
3  .vim/plugin/autohighlight.vim
@@ -1,3 +0,0 @@
-" set updatetime=300
-" au! CursorHold * set hlsearch | let @/='\<'.expand("<cword>").'\>'
-" set hlsearch
View
255 .vimrc
@@ -1,255 +0,0 @@
-" Use Vim settings, rather then Vi settings.
-set nocompatible
-" Set the leader
-let mapleader = ","
-
-" =============== Vundle Initialization ===============
-
-" Loads the plugins in ~/.vim/vundle.vim
-if filereadable(expand("~/.vim/vundles.vim"))
- source ~/.vim/vundles.vim
-endif
-
-" ================ Custom Functions ====================
-
-if v:version >= 704
-
- function! NumberToggle()
- if(&relativenumber == 1)
- set norelativenumber
- set number " Want Hybrid? Comment This Line Out
- else
- set nonumber " Want Hybrid? Comment This Line Out
- set relativenumber
- endif
- endfunc
-
- " au FocusLost * :set norelativenumber | :set number
- " au FocusGained * :set nonumber | :set relativenumber
-
-else
-
- function! NumberToggle()
- if(&relativenumber == 1)
- set number
- else
- set relativenumber
- endif
- endfunc
-
- " au FocusLost * :set number
- " au FocusGained * :set relativenumber
-
-endif
-
-" ================ Custom Key Mappings ====================
-
-" Remap Q! -> q!
-ca Q! q!
-" Remap qw! -> wq!
-ca qw! wq!
-
-" Pressing <leader>vrc sources the ~/.vimrc file
-nnoremap <leader>vrc :source $HOME/.vimrc <CR>
-
-" Pressing <leader>v opens the .vimrc in a new tab
-nnoremap <leader>v :on!<CR>:e! $HOME/.vimrc<CR>
-
-" Toggle Between Relative and Absolute Line Numbers with Ctrl-l
-nnoremap <C-l> :call NumberToggle()<cr>
-
-" Clear the Search Pattern with Leader - Space
-map <leader><Space> :nohlsearch<CR>
-imap <leader><Space> <ESC>:nohlsearch<CR>
-
-" Switch Between Source and Header Files with F1
-map <F1> :FSHere<CR>
-imap <F1> <ESC>:FSHere<CR>
-
-" Toggle Paste Mode with F2
-map <F2> :set invpaste paste?<CR>
-imap <F2> <ESC>:set invpaste paste?<CR>
-
-" Toggle Nerdtree with F4
-map <F4> :NERDTreeToggle<CR>
-imap <F4> <ESC>:NERDTreeToggle<CR>
-
-" if FileType is c, cpp then execute make with F5
-autocmd FileType c,cpp map <F5> :w<CR>:make<CR>
-autocmd FileType c,cpp imap <F5> <ESC>:w<CR>:make<CR>
-
-" Syntastic Error Window with F6
-map <F6> :call ToggleErrors()<CR>
-imap <F6> <ESC>:call ToggleErrors()<CR>
-
-" Go to the Next Error with F6
-" map <F6> :cn<CR>
-" imap <F6> <ESC>:cn<CR>
-
-" Toggle Tagbar with F8
-nmap <F8> :TagbarToggle<CR>
-imap <F8> <ESC>:TagbarToggle<CR>
-
-" Toggle Spelling with F9
-map <F9> :set spell!<CR>
-imap <F9> <ESC>:set spell!<CR>
-
-" ================ General ====================
-
-" Set the update time
-autocmd VimEnter * set updatetime=250
-autocmd WinEnter * set updatetime=250
-autocmd BufEnter * set updatetime=250
-
-" Turn on the status line
-set laststatus=2
-" Disable viminfo file
-set viminfo="NONE"
-" Reload files changed outside vim
-set autoread
-" TODO Not sure what this does?
-set sidescroll=2
-" Start scrolling when we're 8 lines away from margins
-set scrolloff=8
-" Start scrolling when we're 8 lines away from margins
-set sidescrolloff=8
-" Change lines and scroll using the mouse
-set mouse=a
-" Disable welcome screen
-set shortmess+=I
-" 256-Color terminal
-set t_Co=256
-" Allow use of backspace in insert mode
-set backspace=indent,eol,start
-" Turn off beeping sound
-set noerrorbells
-" Disable backup of files with ~ Extension
-set nobackup
-" Similar to atomic save
-set nowritebackup
-" Don't create a swap file
-set noswapfile
-" Don't display anything in the title after exit
-let &titleold=""
-" Enable line numbers
-set number
-" Enable current line highlighting
-set cul
-" Show partial commands in status line
-set showcmd
-
-" Persistent undo
-if has('persistent_undo')
- silent !mkdir ~/.vim/backups > /dev/null 2>&1
- set undodir=~/.vim/backups
- set undofile
-endif
-
-" Enable Setting the Title
-if &term == "screen" || &term == "xterm" || &term == "xterm-256color"
- set title
-endif
-
-if &term == "screen"
- set t_ts=^[k
- set t_fs=^[\
-endif
-
-" ================ Editing ====================
-
-" Tab = 4 spaces
-set tabstop=4
-" Turn on auto indenting
-set autoindent
-" Use 4 spaces When auto indenting
-set shiftwidth=4
-" Copy the previous indentation on auto indenting
-set copyindent
-" Set matching parenthesis
-set showmatch
-
-" Set a line at 80 characters
-if exists('&colorcolumn')
- highlight ColorColumn ctermbg=7
- set colorcolumn=80
- " execute "set colorcolumn=" . join(range(81,335), ',')
-endif
-
-" Any character past the 80 character line will be highlighted in pink
-au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1)
-
-" Show ↪ at the beginning of wrapped lines
-if has("linebreak")
- let &sbr = nr2char(8618).' '
-endif
-
-" Highlight the current line for a window if active and unhighlight if unactive
-augroup BgHighlight
- autocmd!
- autocmd WinEnter * set cul
- autocmd WinLeave * set nocul
-augroup END
-
-
-" ================ Comment Folding ====================
-
-" TODO
-let c_no_comment_fold = 1
-" TODO
-set foldmethod=marker
-" TODO
-set foldmarker=/*,*/
-" Set the fold level
-set foldlevel=1
-" Don't fold by default
-set nofoldenable
-
-" Toggle Folding Under Cursor
-" za
-nnoremap <Space> za
-vnoremap <Space> za
-
-" Close Under Cursor
-" zc
-" Open Under Cursor
-" zo
-
-" Toggle Everything
-" zA
-" Fold Everything
-" zM
-" Unfold Everything
-" zR
-
-" zm
-" zr
-" zi " Invert foldeneable
-
-" ================ Interface ====================
-
-" Turn on language aware syntax
-syntax enable
-" Set the theme
-colo Monokai
-" Set the title to be 'Vim'
-set titlestring=Vim%r\ %m titlelen=70
-" Change the Color of the Line Numbers
-hi LineNr ctermfg=darkcyan ctermbg=black
-" Bold the Line Numbers
-hi CursorLine cterm=bold ctermbg=8
-" Don't Wrap Lines
-" set nowrap
-
-" ================ Searching ====================
-
-" Highlight search terms
-set hlsearch
-" Show search matches while typing
-set incsearch
-" Ignore case when searching
-set ignorecase
-" Ignore case if search pattern is all lowercase, case-sensitive otherwise
-set smartcase
-" TODO
-highlight Search cterm=italic ctermfg=63
-
View
0  .bash_aliases → bash_aliases
File renamed without changes
View
0  .profile → bash_profile
File renamed without changes
View
0  .bashrc → bashrc
File renamed without changes
View
0  .brew → brew
File renamed without changes
View
0  .elementary → elementary
File renamed without changes
View
0  .gitconfig → gitconfig
File renamed without changes
View
0  .gvimrc → gvimrc
File renamed without changes
View
0  .osx → osx
File renamed without changes
View
0  .bash_profile → profile
File renamed without changes
View
0  .tmux.conf → tmux.conf
File renamed without changes
View
0  .vim/bundle/.gitkeep → vim/backups/.gitkeep
File renamed without changes
View
0  .vim/bin/ctags → vim/bin/ctags
File renamed without changes
View
0  .vim/bin/ctags.exe → vim/bin/ctags.exe
File renamed without changes
View
6 .vim/colors/Monokai.vim → vim/colors/Monokai.vim
@@ -1,5 +1,5 @@
-" Vim color file
-" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration)
+"Vim color file
+"Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration)
set background=dark
highlight clear
@@ -104,4 +104,4 @@ hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE
hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
View
0  .vim/plugin/autoload_cscope.vim → vim/plugin/autoload_cscope.vim
File renamed without changes
View
0  .vim/plugin/hicursorwords.vim → vim/plugin/hicursorwords.vim
File renamed without changes
View
3  vim/settings.vim
@@ -0,0 +1,3 @@
+for fpath in split(globpath('~/.vim/settings', '*.vim'), '\n')
+ exe 'source' fpath
+endfor
View
4 vim/settings/NERDtree-tabs.vim
@@ -0,0 +1,4 @@
+" TODO
+let g:nerdtree_tabs_open_on_gui_startup = 1
+let g:nerdtree_tabs_open_on_console_startup = 1
+let g:nerdtree_tabs_focus_on_files = 1
View
18 vim/settings/NERDtree.vim
@@ -0,0 +1,18 @@
+" Remap :B -> :Bookmark
+ca B Bookmark
+
+" Start NERDTree when opening a file with vim
+autocmd vimenter * NERDTree
+" Switch to last opened window
+autocmd VimEnter * wincmd p
+" Start NERDTree even if no file was specified and switch to the new file
+autocmd vimenter * if !argc() | NERDTree | wincmd p | endif
+" Close NERDTree when the vim window is closed
+autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+
+" Set the window size
+let g:NERDTreeWinSize=30
+" Show hidden files by default
+let NERDTreeShowHidden=0
+" Show bookmarks by default
+let NERDTreeShowBookmarks=1
View
26 vim/settings/airline.vim
@@ -0,0 +1,26 @@
+
+let g:airline_theme='bubblegum'
+let g:airline#extensions#tabline#enabled=1
+let g:airline#extensions#tabline#tab_nr_type = 1
+let g:airline#extensions#tabline#show_buffers = 0
+let g:airline_detect_whitespace=0
+set ttimeoutlen=50 " Time to swtich between insert and command mode
+
+let g:airline_powerline_fonts=1
+
+let g:airline_mode_map = {}
+
+let g:airline_mode_map = {
+ \ 'n' : 'Norm',
+ \ 'N' : 'Norm',
+ \ 'p' : 'Pas',
+ \ 'P' : 'Pas',
+ \ 'r' : 'Repl',
+ \ 'R' : 'Repl',
+ \ 'i' : 'Ins',
+ \ 'I' : 'Ins',
+ \ 'v' : 'Vis',
+ \ 'V' : 'Vis',
+ \ 's' : 'Sel',
+ \ 'S' : 'Sel'
+\ }
View
4 vim/settings/bufferline.vim
@@ -0,0 +1,4 @@
+
+
+let g:bufferline_echo = 0
+let g:bufferline_fname_mod = ':t'
View
29 vim/settings/ctrlp.vim
@@ -0,0 +1,29 @@
+let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:10,results:20'
+
+if executable('ag')
+ " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
+ let g:ctrlp_user_command = 'ag %s --files-with-matches -g "" --ignore "\.git$\|\.hg$\|\.svn$"'
+
+ " ag is fast enough that CtrlP doesn't need to cache
+ let g:ctrlp_use_caching = 0
+else
+ " Fall back to using git ls-files if Ag is not available
+ let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$'
+ let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . --cached --exclude-standard --others']
+ let g:ctrlp_use_caching=1
+endif
+
+" Additional mapping for buffer search
+nnoremap <silent> ,b :CtrlPBuffer<cr>
+nnoremap <silent> <C-b> :CtrlPBuffer<cr>
+
+" Cmd-Shift-P to clear the cache
+nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
+
+" Default to filename searches - so that appctrl will find application
+" controller
+let g:ctrlp_by_filename = 1
+
+" Don't jump to already open window. This is annoying if you are maintaining
+" several Tab workspaces and want to open two windows into the same file.
+let g:ctrlp_switch_buffer = 0
View
8 vim/settings/easymotion.vim
@@ -0,0 +1,8 @@
+
+map / <Plug>(easymotion-sn)
+omap / <Plug>(easymotion-tn)
+"map n <Plug>(easymotion-next)
+"map N <Plug>(easymotion-prev)
+
+
+nmap t <Plug>(easymotion-t2)
View
5 vim/settings/nerdcommenter.vim
@@ -0,0 +1,5 @@
+let NERD_c_alt_style=1
+let NERDCommentWholeLinesInVMode=1
+let NERDRemoveAltComs=1
+let NERDRemoveExtraSpaces=1
+let NERDSpaceDelims=1
View
27 vim/settings/syntastic.vim
@@ -0,0 +1,27 @@
+
+let g:syntastic_enable_signs=1
+let g:syntastic_error_symbol = '!'
+let g:syntastic_warning_symbol = '⚠'
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_check_on_open=1
+let g:syntastic_disabled_filetypes=['html']
+let g:syntastic_loc_list_height = 6
+let g:syntastic_stl_format = '[%E{%e Errs, Line: %fe}%B{ | }%W{%w Warns, Line: %fw}]'
+
+let g:syntastic_c_check_header=1
+let g:syntastic_c_compiler = 'cc'
+let g:syntastic_c_checkers=['gcc','make']
+let g:syntastic_c_compiler_options = ' -std=c89 -Wall -Werror'
+
+let g:syntastic_cpp_compiler = 'clang++'
+let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++'
+let g:syntastic_disabled_filetypes=['html']
+
+function! ToggleErrors()
+ let old_last_winnr = winnr('$')
+ lclose
+ if old_last_winnr == winnr('$')
+ " Nothing was closed, open syntastic error location panel
+ Errors
+ endif
+endfunction
View
20 vim/settings/tagbar.vim
@@ -0,0 +1,20 @@
+let os = substitute(system('uname'), "\n", "", "")
+
+if os == "Darwin"
+ let g:tagbar_ctags_bin='$HOME/.vim/bin/ctags'
+
+elseif os == "Linux"
+ let g:tagbar_ctags_bin='/usr/bin/ctags'
+endif
+
+" Start Tarbar when opening a file with vim
+" autocmd VimEnter * nested :TagbarOpen
+
+" If you want to open it only if you're opening Vim with a supported file/files use this instead:
+" autocmd VimEnter * nested :call tagbar#autoopen(1)
+
+" If you use multiple tabs and want Tagbar to also open in the current tab when you switch to an already loaded, supported buffer:
+autocmd BufEnter * nested :call tagbar#autoopen(0)
+
+" Width
+let g:tagbar_width=30
View
13 vim/settings/ycm.vim
@@ -0,0 +1,13 @@
+" *******
+" * YCM *
+" *******
+
+let g:ycm_add_preview_to_completeopt=0
+let g:ycm_autoclose_preview_window_after_completion=1
+" let g:ycm_global_ycm_extra_conf = ''
+let g:ycm_confirm_extra_conf=0
+set completeopt-=preview
+
+
+
+nnoremap <leader>g :YcmCompleter GoToDefinitionElseDeclaration<CR>
View
26 vim/vundles.vim
@@ -0,0 +1,26 @@
+
+" =============== Vundle Config ===============
+" vim --noplugin -u vim/vundles.vim -N "+set hidden" "+syntax on" +BundleClean! +BundleInstall +qall
+
+" Required by Vundle!
+filetype off
+
+set rtp+=~/.vim/bundle/vundle/
+set rtp+=~/.vim/vundles/
+call vundle#rc()
+
+" let Vundle manage Vundle
+Bundle "gmarik/vundle"
+
+"runtime vundles/**/*.vundle
+runtime vundles/git.vundle
+runtime vundles/search.vundle
+runtime vundles/vim-improvements.vundle
+
+" Loads the plugin settings in ~/.vim/settings.vim
+if filereadable(expand("settings.vim"))
+ source settings.vim
+endif
+
+" Required by Vundle!
+filetype plugin indent on
View
2  vim/vundles/git.vundle
@@ -0,0 +1,2 @@
+Bundle "gregsexton/gitv"
+Bundle "tpope/vim-fugitive"
View
5 vim/vundles/search.vundle
@@ -0,0 +1,5 @@
+Bundle "scrooloose/nerdtree.git"
+Bundle "jistr/vim-nerdtree-tabs.git"
+Bundle "kien/ctrlp.vim"
+Bundle "Lokaltog/vim-easymotion"
+Bundle "majutsushi/tagbar"
View
8 vim/vundles/vim-improvements.vundle
@@ -0,0 +1,8 @@
+Bundle "terryma/vim-multiple-cursors"
+Bundle "bling/vim-airline"
+Bundle "bling/vim-bufferline"
+Bundle "errormarker.vim"
+Bundle "scrooloose/nerdcommenter"
+Bundle "derekwyatt/vim-fswitch"
+Bundle "Valloric/YouCompleteMe"
+Bundle "scrooloose/syntastic"
View
0  .zsh_aliases → zsh_aliases
File renamed without changes
View
0  .zshrc → zshrc
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.