Skip to content

Commit

Permalink
submodules integrated
Browse files Browse the repository at this point in the history
  • Loading branch information
Michal Au committed Aug 11, 2015
1 parent 2723698 commit 4644d57
Show file tree
Hide file tree
Showing 13 changed files with 54 additions and 32 deletions.
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "bundle/nerdtree"]
path = bundle/nerdtree
url = https://github.com/scrooloose/nerdtree.git
[submodule "bundle/jedi-vim"]
path = bundle/jedi-vim
url = https://github.com/davidhalter/jedi-vim.git
[submodule "bundle/vim-airline"]
path = bundle/vim-airline
url = https://github.com/bling/vim-airline
50 changes: 29 additions & 21 deletions .vimrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
"automatic reoloading of .vimrc
autocmd! bufwritepost .vimrc source %

"Setup Pathogen to manage the plugins
execute pathogen#infect()
call pathogen#helptags()


"Rebind <Leader> key
let mapleader=","
Expand All @@ -11,25 +15,32 @@ set guioptions-=T "remove the icon bar
" 'hide' pale gray areas by ~/.gtkrc-2.0


"firefox-like tab navigation
"nnoremap <C-tab> :tabnext<CR>
"nnoremap <C-S-tab> :tabprevious<CR>
set ignorecase

" vim-airline
set laststatus=2
let g:Powerline_symbols = 'fancy'
let g:Powerline_symbols = 'unicode'
let g:airline#extensions#tabline#enabled = 1
let g:airline_theme = "murmur"
let g:airline_powerline_fonts = 1
let g:airline_symbols.space = "\ua0"

set hidden
nnoremap <C-tab> :bnext<CR>
nnoremap <C-S-tab> :bprevious<CR>
nmap <leader>t :enew<cr>
"nnoremap <C-tab> :bnext<CR>
"nnoremap <C-S-tab> :bprevious<CR>
nnoremap <leader>m :bnext<CR>
nnoremap <leader>n :bprevious<CR>
nnoremap <leader>b :enew<cr>
nnoremap <leader>q :bp<cr>:bd #<cr>
"firefox-like tab navigation
nnoremap <C-tab> :tabnext<CR>
nnoremap <C-S-tab> :tabprevious<CR>
nnoremap <C-S-T> :tabe<CR>
"set swap directory:
set directory=~/.vim/swap
set noswapfile
"set directory=~/.vim/swap

"better copy & paste behaviour
"set pastetoggle=<F2>
Expand Down Expand Up @@ -82,17 +93,20 @@ nmap Q gqap
set history=700
set undolevels=700


" Tabstops
set tabstop=4
set softtabstop=4
set shiftwidth=4
set shiftround
set expandtab

"Setup Pathogen to manage the plugins
execute pathogen#infect()
set listchars=tab:▸\ ,nbsp:_,trail:.
set list


nmap <leader>l iprint "\n{}\n".format()<Esc>i

nmap <leader>l oprint "\n{}\n".format()<Esc>i
"NERDTree
nmap <leader>nt :NERDTree<CR>
Expand All @@ -116,16 +130,16 @@ set wildignore+=*_build/*
set wildignore+=*/coverage/*

"Jedi setup
" let g:jedi#use_splits_not_buffers = "right"
set completeopt-=preview "disable definitions window (very slow)
let g:jedi#use_splits_not_buffers = "right"
let g:jedi#show_call_signatures = "0"
let g:pymode_rope_lookup_project = 0
let g:pymode_rope = 0
let g:pymode_options_colorcolumn = 0
" jedi-vim disable documentation on autocomplete
autocmd FileType python setlocal completeopt-=preview
let g:pymode = 1
let g:pymode_trim_whitespaces = 1
let g:pymode_options = 1
let g:pymode_folding = 0
"let g:pymode_folding = 0
let g:pymode_lint_unmodified = 1
let g:pymode_lint_ignore = "E501"
let g:pymode_lint_on_fly = 0
Expand All @@ -138,12 +152,6 @@ let g:pymode_rope_lookup_project = 0
let g:pymode_rope_regenerate_on_write = 0
let g:pymode_rope_completion = 0
let g:pymode_rope_complete_on_dot = 0
let g:pymode_rope_completion_bind = '<C-Space>'

" jedi-vim
let g:jedi#show_call_signatures = "0"
let g:jedi#usages_command = "<leader>N"

""Python-mode setup
"map <Leader>g :call RopeGotoDefinition()<CR>
"let ropevim_enable_shortcuts=1
Expand Down
15 changes: 14 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
This is my Vim config.
Installation:

git clone git://github.com/nelstrom/dotvim.git ~/.vim

Create symlinks:

ln -s ~/.vim/vimrc ~/.vimrc
ln -s ~/.vim/gvimrc ~/.gvimrc

Switch to the `~/.vim` directory, and fetch submodules:

cd ~/.vim
git submodule init
git submodule update
1 change: 0 additions & 1 deletion bundle/ctrlp.vim
Submodule ctrlp.vim deleted from b5d3fe
1 change: 0 additions & 1 deletion bundle/fonts
Submodule fonts deleted from 97dc45
2 changes: 1 addition & 1 deletion bundle/jedi-vim
2 changes: 1 addition & 1 deletion bundle/nerdtree
1 change: 0 additions & 1 deletion bundle/powerline
Submodule powerline deleted from 090cd1
1 change: 0 additions & 1 deletion bundle/python-mode
Submodule python-mode deleted from 9c8468
1 change: 0 additions & 1 deletion bundle/vim-fugitive
Submodule vim-fugitive deleted from 03cc95
1 change: 0 additions & 1 deletion bundle/vim-gitgutter
Submodule vim-gitgutter deleted from fe10e6
1 change: 0 additions & 1 deletion bundle/vim-powerline
Submodule vim-powerline deleted from 09c0ce
1 change: 0 additions & 1 deletion bundle/vim-sensible
Submodule vim-sensible deleted from b30dcf

0 comments on commit 4644d57

Please sign in to comment.