]> git.zndr.dk Git - dotfiles.git/commitdiff
Add vundle as submodule
authorJannik ZANDER <jannikz@gmail.com>
Tue, 3 May 2016 11:26:16 +0000 (13:26 +0200)
committerJannik ZANDER <jannikz@gmail.com>
Tue, 3 May 2016 11:26:16 +0000 (13:26 +0200)
.gitmodules [new file with mode: 0644]
.vim/bundle/Vundle.vim [new submodule]
.vimrc

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..5790a94
--- /dev/null
@@ -0,0 +1,3 @@
+[submodule ".vim/bundle/Vundle.vim"]
+       path = .vim/bundle/Vundle.vim
+       url = http://github.com/VundleVim/Vundle.Vim
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
new file mode 160000 (submodule)
index 0000000..4984767
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45
diff --git a/.vimrc b/.vimrc
index 52239eb857aaee3680e156eb8e069cf398c77fe4..7de0b3b961c0c2687b88b140c670c11f87418415 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,4 +1,10 @@
-" set the runtime path to include Vundle and initialize
+set nocompatible
+
+"------------------------------------------------------------------------------
+" For Vundle
+"------------------------------------------------------------------------------
+"
+filetype off
 set rtp+=$HOME/.vim/bundle/Vundle.vim
 call vundle#begin('$HOME/.vim/bundle/')
 
@@ -6,22 +12,52 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'thanthese/Tortoise-Typing'
 Plugin 'altercation/vim-colors-solarized.git'
 Plugin 'plasticboy/vim-markdown'
+Plugin 'mileszs/ack.vim'
+Plugin 'brandonbloom/csearch.vim'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
-
 syntax enable           " syntaxs highlightning
+
+"------------------------------------------------------------------------------
+" Regular setting
+"------------------------------------------------------------------------------
+"
 set backspace=2         " backspace in insert mode works like normal editor
 set autoindent          " auto indenting
 set number              " line numbers
 set nobackup            " get rid of anoying ~file
+set encoding=utf-8
+set expandtab
+set fileencodings=ucs-bom,utf-8,euc-jp
+set hid
+set hlsearch
+set incsearch
+set laststatus=2
+set number
+set mouse=a
+set ruler
+set shiftwidth=4
+set showcmd
+set smartindent
+set showmatch
+set tabstop=4
+set visualbell t_vb=
+set modeline
+set modelines=1
 
+" For color
 "let g:solarized_termcolors=256
 colorscheme solarized
 set background=dark
 
+" Vim tips #59
+set tags+=tags;
+
+" For markdown
 let g:vim_markdown_folding_disabled = 1
 
+" For local settings overwrite
 let $LOCALFILE=expand("~/.vimrc_local")
 if filereadable($LOCALFILE)
 source $LOCALFILE