vim Vundle added, vim-arline added

This commit is contained in:
2014-09-08 20:30:04 +02:00
parent e909d2e520
commit 455afba83b
23 changed files with 69 additions and 85 deletions

60
.gitmodules vendored
View File

@@ -1,60 +1,2 @@
[submodule "vim/bundle/vim-pathogen"]
path = vim/bundle/vim-pathogen
url = https://github.com/tpope/vim-pathogen.git
[submodule "vim/bundle/ctrlp.vim"]
path = vim/bundle/ctrlp.vim
url = https://github.com/kien/ctrlp.vim.git
[submodule "vim/bundle/ack.vim"]
path = vim/bundle/ack.vim
url = https://github.com/mileszs/ack.vim.git
[submodule "vim/bundle/nerdcommenter"]
path = vim/bundle/nerdcommenter
url = https://github.com/scrooloose/nerdcommenter.git
[submodule "vim/bundle/nerdtree"]
path = vim/bundle/nerdtree
url = https://github.com/scrooloose/nerdtree.git
[submodule "vim/bundle/supertab"]
path = vim/bundle/supertab
url = https://github.com/ervandew/supertab.git
[submodule "vim/bundle/vim-fugitive"]
path = vim/bundle/vim-fugitive
url = https://github.com/tpope/vim-fugitive.git
[submodule "vim/bundle/gundo.vim"]
path = vim/bundle/gundo.vim
url = https://github.com/sjl/gundo.vim.git
[submodule "vim/bundle/vim-endwise"]
path = vim/bundle/vim-endwise
url = https://github.com/tpope/vim-endwise.git
[submodule "vim/bundle/vim-ruby"]
path = vim/bundle/vim-ruby
url = https://github.com/vim-ruby/vim-ruby.git
[submodule "vim/bundle/vim-rails"]
path = vim/bundle/vim-rails
url = https://github.com/tpope/vim-rails.git
[submodule "vim/bundle/vim-surround"]
path = vim/bundle/vim-surround
url = https://github.com/tpope/vim-surround.git
[submodule "vim/bundle/vimwiki"]
path = vim/bundle/vimwiki
url = https://github.com/vimwiki/vimwiki.git
[submodule "vim/bundle/vim-coffee-script"]
path = vim/bundle/vim-coffee-script
url = https://github.com/kchmck/vim-coffee-script.git
[submodule "vim/bundle/vim-cucumber"]
path = vim/bundle/vim-cucumber
url = https://github.com/tpope/vim-cucumber.git
[submodule "vim/bundle/vim-haml"]
path = vim/bundle/vim-haml
url = https://github.com/tpope/vim-haml.git
[submodule "vim/bundle/vim-mustache-handlebars"]
path = vim/bundle/vim-mustache-handlebars
url = https://github.com/mustache/vim-mustache-handlebars.git
[submodule "vim/bundle/vim-javascript"]
path = vim/bundle/vim-javascript
url = https://github.com/pangloss/vim-javascript.git
[submodule "vim/bundle/yaml-vim"]
path = vim/bundle/yaml-vim
url = https://github.com/ingydotnet/yaml-vim.git
[submodule "vim/bundle/delimitMate"]
path = vim/bundle/delimitMate
url = https://github.com/Raimondi/delimitMate.git
fetchRecurseSubmodules = false

View File

@@ -3,4 +3,5 @@ zlorfi's dotfiles
* copy to your ~ ($HOME)
* create symlinks via the `make_my_dotfiles.sh` script
* run ```git submodule init && git submodule update``` before starting vim
* install patched `Source Code Pro` font for the `vim-airline` plugin
* launch `vim` and run `:PluginInstall`

4
gvimrc
View File

@@ -1,7 +1,7 @@
" Copy to ~/.gvimrc or ~/_gvimrc.
"set guifont=Menlo\ Regular:h14
set guifont=Source\ Code\ Pro:h14
set guifont=Source\ Code\ Pro\ for\ Powerline:h14 "make sure to escape the spaces in the name properly
" set guifont=Source\ Code\ Pro:h16
set antialias " MacVim: smooth fonts.
set encoding=utf-8 " Use UTF-8 everywhere.
set guioptions-=T " Hide toolbar.

1
vim/bundle/Vundle.vim Submodule

Submodule vim/bundle/Vundle.vim added at 0b28e334e6

Submodule vim/bundle/ack.vim updated: f183a345a0...303bceff1c

Submodule vim/bundle/delimitMate updated: a1f21e8ef5...38487bbec8

Submodule vim/bundle/nerdcommenter updated: 0b3d928dce...6549cfde45

Submodule vim/bundle/nerdtree updated: b0bb781fc7...4f1e6ecb05

Submodule vim/bundle/supertab updated: 7a32e0866b...4e2376a5b4

Submodule vim/bundle/vim-airline added at 3f3ae446e1

Submodule vim/bundle/vim-cucumber updated: 9e686ad36d...e1728c9141

Submodule vim/bundle/vim-endwise updated: 1e651aafc7...ab5f7f99f4

Submodule vim/bundle/vim-fugitive updated: 8f0b8edfbd...0374322ba5

Submodule vim/bundle/vim-haml updated: 33279476a6...204e327211

Submodule vim/bundle/vim-javascript updated: 7e28dbd4e0...f8122fd1ca

Submodule vim/bundle/vim-mustache-handlebars updated: b914a22331...71bd9aff49

Submodule vim/bundle/vim-rails updated: ec52270523...c406fb76c8

Submodule vim/bundle/vim-ruby updated: d1f747115a...5bc55bec63

Submodule vim/bundle/vim-surround updated: 42e9b46e7a...fa433e0b73

Submodule vim/bundle/vimwiki updated: 5faf884dc6...2c03d82a0e

Submodule vim/bundle/yaml-vim updated: 963d1351b5...033d904b16

52
vimrc
View File

@@ -6,12 +6,47 @@ set nocompatible
set history=1000
" Initialize Pathogen
runtime bundle/vim-pathogen/autoload/pathogen.vim
execute pathogen#infect()
" runtime bundle/vim-pathogen/autoload/pathogen.vim
" execute pathogen#infect()
" filetype plugin indent on
filetype off
" set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
" let Vundle manage Vundle, required
Plugin 'gmarik/Vundle.vim'
Plugin 'bling/vim-airline'
Plugin 'mileszs/ack.vim'
Plugin 'kien/ctrlp.vim'
Plugin 'Raimondi/delimitMate'
Plugin 'sjl/gundo.vim'
Plugin 'scrooloose/nerdcommenter'
Plugin 'scrooloose/nerdtree'
Plugin 'ervandew/supertab'
Plugin 'kchmck/vim-coffee-script'
Plugin 'tpope/vim-cucumber'
Plugin 'tpope/vim-endwise'
Plugin 'tpope/vim-fugitive'
Plugin 'tpope/vim-haml'
Plugin 'pangloss/vim-javascript'
Plugin 'mustache/vim-mustache-handlebars'
Plugin 'tpope/vim-rails'
Plugin 'vim-ruby/vim-ruby'
Plugin 'tpope/vim-surround'
Plugin 'vimwiki/vimwiki'
Plugin 'ingydotnet/yaml-vim'
" All of your Plugins must be added before the following line
call vundle#end() " required
filetype plugin indent on " required
" Enable syntax highlighting
syntax on
filetype plugin indent on
" Colorscheme
let g:molokai_original = 1
@@ -46,7 +81,8 @@ set softtabstop=2
set expandtab
" SET Font
set guifont=Menlo\ Regular:h14
" set guifont=Menlo\ Regular:h14
set guifont=Source\ Code\ Pro\ for\ Powerline:h14 "make sure to escape the spaces in the name properly
" Show trailing spaces and highlight hard tabs
set list listchars=tab:»·,trail
@@ -87,11 +123,15 @@ set nowritebackup " And again.
set directory=$HOME/.vim/tmp//,. " Keep swap files in one location
set laststatus=2 " Show the status line all the time
" set laststatus=2 " Show the status line all the time
" Useful status information at bottom of screen
set statusline=[%n]\ %<%.99f\ %h%w%m%r%y%{fugitive#statusline()}\ %=%-16(\ Line:\ %l\ of\ %L\ %)\ %=%-30(%{strftime(\"\%c\",getftime(expand(\"\%\%\")))}\ %)%P
" set statusline=[%n]\ %<%.99f\ %h%w%m%r%y%{fugitive#statusline()}\ %=%-16(\ Line:\ %l\ of\ %L\ %)\ %=%-30(%{strftime(\"\%c\",getftime(expand(\"\%\%\")))}\ %)%P
" set statusline=[%n]\ %<%.99f\ %h%w%m%r%y\ %=%-16(\ Line:\ %l\ of\ %L\ %)\ %=%-30(%{strftime(\"\%c\",getftime(expand(\"\%\%\")))}\ %)%P
" airline Smarter tab line
let g:airline#extensions#tabline#enabled = 1
let g:airline_powerline_fonts = 1
" NERDTreee show hidden files by default
let g:NERDTreeShowHidden = 1
let g:NERDTreeChDirMode = 2