summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
m---------bundle/Vundle.vim0
-rw-r--r--plugins.vim13
-rw-r--r--vimrc11
4 files changed, 24 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..75554b2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "bundle/Vundle.vim"]
+ path = bundle/Vundle.vim
+ url = https://github.com/VundleVim/Vundle.vim.git
diff --git a/bundle/Vundle.vim b/bundle/Vundle.vim
new file mode 160000
+Subproject 9a38216a1c0c597f978d73547d37681fc689c90
diff --git a/plugins.vim b/plugins.vim
new file mode 100644
index 0000000..ee5a14a
--- /dev/null
+++ b/plugins.vim
@@ -0,0 +1,13 @@
+set nocompatible
+filetype off
+set rtp+=~/.vim/bundle/Vundle.vim
+
+call vundle#begin()
+
+Plugin 'VundleVim/Vundle.vim'
+Plugin 'scrooloose/nerdtree'
+
+call vundle#end()
+
+filetype plugin indent on
+
diff --git a/vimrc b/vimrc
index 79b6e55..afbda7a 100644
--- a/vimrc
+++ b/vimrc
@@ -1,11 +1,13 @@
+so ~/.vim/plugins.vim
+
filetype on
syntax on
colorscheme desert
set number
filetype indent on
set nowrap
-set tabstop=4
-set shiftwidth=4
+set tabstop=2
+set shiftwidth=2
set expandtab
set smartindent
set autoindent
@@ -21,4 +23,7 @@ set showmatch
autocmd BufWritePre * :%s/\s\+$//e
" press esc to cancel search
-nnoremap <silent> <Esc> :nohlsearch<Bar>:echo<CR>
+noremap <silent> <Esc> :nohlsearch<Bar>:echo<CR>
+
+" toggle nerdtree with ctrl-o
+map <C-o> :NERDTreeToggle<CR>