Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: keitaoouchi/dotfiles_public
base: a87e5b9b6b
...
head fork: keitaoouchi/dotfiles_public
compare: e16767c381
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
4 .bash_profile
@@ -58,8 +58,8 @@ export PIP_USE_MIRRORS=true
#limit core dump size
ulimit -c 0
-#settings for pythonbrew
-[[ -s "$HOME/.pythonbrew/etc/bashrc" ]] && source "$HOME/.pythonbrew/etc/bashrc"
+#settings for pythonz
+[[ -s "$HOME/.pythonz/etc/bashrc" ]] && source "$HOME/.pythonz/etc/bashrc"
#settings for rvm
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
1  .vim/bundle/BlockDiff
@@ -0,0 +1 @@
+Subproject commit 0f0988e219fd41fdac351a58a77788d9af21ecd3
1  .vim/bundle/YankRing.vim
@@ -0,0 +1 @@
+Subproject commit e42cac0d8d84be5602109f4e614caa0854470fc1
1  .vim/bundle/tcomment_vim
@@ -0,0 +1 @@
+Subproject commit 87adab024258071cd4bc6055d544605505a160e1
1  .vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b
View
2  .vim/ftplugin/python.vim
@@ -1,3 +1,5 @@
+" 補完を有効にする
+autocmd FileType python set omnifunc=pythoncomplete#Complete
" PEP 8 Indent rule
setl tabstop=8
setl softtabstop=4
View
35 .vimrc
@@ -55,7 +55,6 @@ Bundle 'lambdalisue/nose.vim'
" Python complete
Bundle 'vim-scripts/pythoncomplete'
-autocmd FileType python set omnifunc=pythoncomplete#Complete
" Django Support
Bundle 'lambdalisue/vim-django-support'
@@ -85,8 +84,8 @@ Bundle 'Shougo/neocomplcache'
Bundle 'Shougo/neocomplcache-snippets-complete'
" vimshell
-Bundle 'Shougo/vimproc'
-Bundle 'Shougo/vimshell'
+"Bundle 'Shougo/vimproc'
+"Bundle 'Shougo/vimshell'
Bundle 'trinity.vim'
Bundle 'taglist.vim'
@@ -94,6 +93,12 @@ Bundle 'Source-Explorer-srcexpl.vim'
Bundle 'vim-jp/vimdoc-ja'
+Bundle 'adie/BlockDiff'
+
+Bundle 'tpope/vim-surround'
+
+Bundle 'tomtom/tcomment_vim'
+
filetype plugin indent on
" ----------------------------------------
@@ -167,7 +172,8 @@ nmap ,rp :<C-u>Ref phpmanual<Space>
" indentation guides
"let g:indent_guides_enable_on_vim_startup=1
-"let g:indent_guides_guide_size=4
+"let g:indent_guides_color_change_percent = 30
+"let g:indent_guides_guide_size=1
" ----------------------------------------
" 色関連
@@ -187,28 +193,27 @@ set incsearch
nnoremap n nzz
nnoremap N Nzz
nnoremap <Esc><Esc> :nohlsearch<CR>
-
" ----------------------------------------
-" Unite.vim
+" unite.vim
" ----------------------------------------
let g:unite_enable_start_insert = 1
" open unite buffer
-nnoremap <space><space> :Unite buffer file_rec<CR>
+nnoremap <space><space> :unite buffer file_rec<cr>
" ----------------------------------------
" neocomplcache.vim
" ----------------------------------------
let g:neocomplcache_enable_at_startup = 1
-highlight Pmenu ctermbg=8
-highlight PmenuSel ctermbg=1
-highlight PmenuSbar ctermbg=0
+highlight pmenu ctermbg=8
+highlight pmenusel ctermbg=1
+highlight pmenusbar ctermbg=0
-imap <expr><Tab> neocomplcache#sources#snippets_complete#expandable() ? "\<Plug>(neocomplcache_snippets_expand)" : pumvisible() ? "\<C-n>" : "\<Tab>"
-smap <expr><Tab> neocomplcache#sources#snippets_complete#expandable() ? "\<Plug>(neocomplcache_snippets_expand)" : pumvisible() ? "\<C-n>" : "\<Tab>"
+imap <expr><tab> neocomplcache#sources#snippets_complete#expandable() ? "\<plug>(neocomplcache_snippets_expand)" : pumvisible() ? "\<c-n>" : "\<tab>"
+smap <expr><tab> neocomplcache#sources#snippets_complete#expandable() ? "\<plug>(neocomplcache_snippets_expand)" : pumvisible() ? "\<c-n>" : "\<tab>"
-inoremap <expr><CR> neocomplcache#smart_close_popup()."\<CR>"
+inoremap <expr><cr> neocomplcache#smart_close_popup()."\<cr>"
inoremap <expr><C-y> neocomplcache#close_popup()
inoremap <expr><C-e> neocomplcache#cancel_popup()
@@ -234,11 +239,11 @@ map <Leader>x <Plug>NERDCommenterToggle
silent! map <unique> <Space>q <Plug>(quickrun)
let g:quickrun_config = {}
-let g:quickrun_config['*'] = {'runmode': "async:remote:vimproc", 'split':'below'}
+let g:quickrun_config['*'] = {'runmode': "async:remote:python", 'split':'below'}
" ----------------------------------------
" Key Mappings for Compatible with Emacs
" ----------------------------------------
-noremap <C-p> <Up>
+inoremap <C-p> <Up>
inoremap <C-n> <Down>
inoremap <C-b> <Left>
inoremap <C-f> <Right>

No commit comments for this range

Something went wrong with that request. Please try again.