Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
33 changed files
with
43 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
.netrwhist | ||
.DS_Store | ||
vim/bundle/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,108 +1,24 @@ | ||
[submodule "vim/bundle/vim-endwise"] | ||
path = vim/bundle/vim-endwise | ||
url = https://github.com/tpope/vim-endwise.git | ||
[submodule "vim/bundle/vim-surround"] | ||
path = vim/bundle/vim-surround | ||
url = https://github.com/tpope/vim-surround.git | ||
[submodule "vim/bundle/nerdtree"] | ||
path = vim/bundle/nerdtree | ||
url = https://github.com/scrooloose/nerdtree.git | ||
[submodule "vim/bundle/nerdcommenter"] | ||
path = vim/bundle/nerdcommenter | ||
url = https://github.com/scrooloose/nerdcommenter.git | ||
[submodule "vim/bundle/vim-repeat"] | ||
path = vim/bundle/vim-repeat | ||
url = https://github.com/tpope/vim-repeat.git | ||
[submodule "vim/bundle/vim-javascript"] | ||
path = vim/bundle/vim-javascript | ||
url = https://github.com/pangloss/vim-javascript.git | ||
[submodule "vim/bundle/vim-fugitive"] | ||
path = vim/bundle/vim-fugitive | ||
url = https://github.com/tpope/vim-fugitive.git | ||
[submodule "vim/bundle/vim-markdown"] | ||
path = vim/bundle/vim-markdown | ||
url = https://github.com/plasticboy/vim-markdown.git | ||
[submodule "vim/bundle/vim-ruby"] | ||
path = vim/bundle/vim-ruby | ||
url = https://github.com/vim-ruby/vim-ruby.git | ||
[submodule "vim/bundle/tabular"] | ||
path = vim/bundle/tabular | ||
url = https://github.com/godlygeek/tabular | ||
[submodule "vim/bundle/gundo.vim"] | ||
path = vim/bundle/gundo.vim | ||
url = https://github.com/sjl/gundo.vim.git | ||
[submodule "vim/bundle/supertab"] | ||
path = vim/bundle/supertab | ||
url = https://github.com/ervandew/supertab.git | ||
[submodule "vim/bundle/ctrlp"] | ||
path = vim/bundle/ctrlp | ||
url = https://github.com/kien/ctrlp.vim.git | ||
[submodule "tomorrow-theme"] | ||
path = tomorrow-theme | ||
url = https://github.com/chriskempson/tomorrow-theme | ||
[submodule "vim/bundle/vim-tmux-navigator"] | ||
path = vim/bundle/vim-tmux-navigator | ||
url = https://github.com/christoomey/vim-tmux-navigator.git | ||
[submodule "vim/bundle/vim-airline"] | ||
path = vim/bundle/vim-airline | ||
url = https://github.com/bling/vim-airline.git | ||
[submodule "vim/bundle/vim-pathogen"] | ||
path = vim/bundle/vim-pathogen | ||
url = https://github.com/tpope/vim-pathogen.git | ||
[submodule "base16-theme"] | ||
path = base16-theme | ||
url = https://github.com/chriskempson/base16.git | ||
[submodule "themes/base16-iterm2"] | ||
path = themes/base16-iterm2 | ||
url = https://github.com/chriskempson/base16-iterm2 | ||
[submodule "vim/bundle/base16-theme"] | ||
path = vim/bundle/base16-theme | ||
url = https://github.com/chriskempson/base16-vim | ||
[submodule "zsh/base16-theme"] | ||
path = zsh/base16-theme | ||
url = https://github.com/chriskempson/base16-shell.git | ||
[submodule "vim/bundle/vim-gitgutter"] | ||
path = vim/bundle/vim-gitgutter | ||
url = https://github.com/airblade/vim-gitgutter.git | ||
[submodule "vim/bundle/nerdtree-ag"] | ||
path = vim/bundle/nerdtree-ag | ||
url = https://github.com/taiansu/nerdtree-ag.git | ||
[submodule "vim/bundle/vim-rails"] | ||
path = vim/bundle/vim-rails | ||
url = https://github.com/tpope/vim-rails.git | ||
[submodule "vim/bundle/vim-ag"] | ||
path = vim/bundle/vim-ag | ||
url = https://github.com/rking/ag.vim.git | ||
[submodule "vim/bundle/vim-dispatch"] | ||
path = vim/bundle/vim-dispatch | ||
url = https://github.com/tpope/vim-dispatch.git | ||
[submodule "vim/bundle/vim-tmux"] | ||
path = vim/bundle/vim-tmux | ||
url = https://github.com/tmux-plugins/vim-tmux.git | ||
[submodule "themes/base16-shell"] | ||
path = themes/base16-shell | ||
url = https://github.com/chriskempson/base16-shell.git | ||
[submodule "vim/bundle/vim-go"] | ||
path = vim/bundle/vim-go | ||
url = https://github.com/fatih/vim-go.git | ||
[submodule "themes/powerline"] | ||
path = themes/powerline | ||
url = https://github.com/powerline/fonts | ||
[submodule "vim/bundle/vim-airline-themes"] | ||
path = vim/bundle/vim-airline-themes | ||
url = git@github.com:vim-airline/vim-airline-themes.git | ||
[submodule "themes/fonts"] | ||
path = themes/fonts | ||
url = https://github.com/powerline/fonts | ||
[submodule "vim/bundle/tagbar"] | ||
path = vim/bundle/tagbar | ||
url = https://github.com/majutsushi/tagbar.git | ||
[submodule "vim/bundle/neocomplete"] | ||
path = vim/bundle/neocomplete | ||
url = https://github.com/Shougo/neocomplete.vim.git | ||
[submodule "vim/bundle/vim-easymotion"] | ||
path = vim/bundle/vim-easymotion | ||
url = https://github.com/easymotion/vim-easymotion.git | ||
[submodule "vim/bundle/vim-markdown-preview"] | ||
path = vim/bundle/vim-markdown-preview | ||
url = https://github.com/JamshedVesuna/vim-markdown-preview.git | ||
[submodule "vim/bundle/Vundle.vim"] | ||
path = vim/bundle/Vundle.vim | ||
url = https://github.com/VundleVim/Vundle.vim.git |
Submodule Vundle.vim
added at
6437ad
Submodule base16-theme
deleted from
c1c3e6
Submodule ctrlp
deleted from
564176
Submodule gundo.vim
deleted from
46c443
Submodule neocomplete
deleted from
d8caad
Submodule nerdcommenter
deleted from
285902
Submodule nerdtree
deleted from
e2a992
Submodule nerdtree-ag
deleted from
1f9175
Submodule supertab
deleted from
22aac5
Submodule tabular
deleted from
00e1e7
Submodule tagbar
deleted from
f57927
Submodule vim-ag
deleted from
4a0dd6
Submodule vim-airline
deleted from
72e5f0
Submodule vim-airline-themes
deleted from
5d75d7
Submodule vim-dispatch
deleted from
14a169
Submodule vim-easymotion
deleted from
e4d71c
Submodule vim-endwise
deleted from
d56552
Submodule vim-fugitive
deleted from
913fff
Submodule vim-gitgutter
deleted from
c92f61
Submodule vim-go
deleted from
76cd99
Submodule vim-javascript
deleted from
09d7c7
Submodule vim-markdown
deleted from
3fcde7
Submodule vim-markdown-preview
deleted from
bdb445
Submodule vim-pathogen
deleted from
ddfb1f
Submodule vim-rails
deleted from
720603
Submodule vim-repeat
deleted from
070ee9
Submodule vim-ruby
deleted from
074200
Submodule vim-surround
deleted from
e49d6c
Submodule vim-tmux
deleted from
9ead25
Submodule vim-tmux-navigator
deleted from
d72409
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,46 @@ | ||
" ---------- | ||
" Vim Config | ||
" ---------- | ||
" | ||
" | ||
" How this works: | ||
" | ||
" This file is minimal. Most of the vim settings and initialization is in | ||
" several files in .vim/init. This makes it easier to find things and to | ||
" merge between branches and repos. | ||
" | ||
" Please do not add configuration to this file, unless it *really* needs to | ||
" come first or last, like Pathogen and sourcing the machine-local config. | ||
" Instead, add it to one of the files in .vim/init, or create a new one. | ||
|
||
|
||
" Pathogen (This must happen first.) | ||
" -------- | ||
|
||
" filetype off " Avoid a Vim/Pathogen bug | ||
runtime bundle/vim-pathogen/autoload/pathogen.vim | ||
execute pathogen#infect() | ||
" call pathogen#helptags() | ||
" call pathogen#runtime_append_all_bundles() | ||
|
||
set nocompatible " Don't maintain compatibility with vi | ||
filetype off " Avoid a Vim/Vundle bug | ||
set rtp+=~/.vim/bundle/Vundle.vim | ||
call vundle#begin() | ||
|
||
syntax on " Highlight known syntaxes | ||
filetype plugin indent on | ||
|
||
|
||
" Source initialization files | ||
" --------------------------- | ||
Plugin 'VundleVim/Vundle.vim' | ||
|
||
Plugin 'JamshedVesuna/vim-markdown-preview' | ||
Plugin 'Shougo/neocomplete.vim' | ||
Plugin 'airblade/vim-gitgutter' | ||
Plugin 'bling/vim-airline' | ||
Plugin 'christoomey/vim-tmux-navigator' | ||
Plugin 'easymotion/vim-easymotion' | ||
Plugin 'ervandew/supertab' | ||
Plugin 'fatih/vim-go' | ||
Plugin 'godlygeek/tabular' | ||
Plugin 'kien/ctrlp.vim' | ||
Plugin 'majutsushi/tagbar' | ||
Plugin 'plasticboy/vim-markdown' | ||
Plugin 'rking/ag.vim' | ||
Plugin 'scrooloose/nerdcommenter' | ||
Plugin 'scrooloose/nerdtree' | ||
Plugin 'sjl/gundo.vim' | ||
Plugin 'taiansu/nerdtree-ag' | ||
Plugin 'tmux-plugins/vim-tmux' | ||
Plugin 'tpope/vim-dispatch' | ||
Plugin 'tpope/vim-endwise' | ||
Plugin 'tpope/vim-fugitive' | ||
Plugin 'tpope/vim-pathogen' | ||
Plugin 'tpope/vim-rails' | ||
Plugin 'tpope/vim-repeat' | ||
Plugin 'tpope/vim-surround' | ||
Plugin 'vim-airline/vim-airline-themes' | ||
Plugin 'vim-ruby/vim-ruby' | ||
Plugin 'chriskempson/base16-vim' | ||
|
||
|
||
call vundle#end() | ||
filetype plugin indent on | ||
|
||
runtime! init/**.vim | ||
|
||
|
||
" Machine-local vim settings - keep this at the end | ||
" -------------------------- | ||
silent! source ~/.vimrc.local |