[from now] 2012/10/31 00:07:00

diff --git a/.vim/after/ftplugin/php.vim b/.vim/after/ftplugin/php.vim
deleted file mode 100644
index 8ec5647..0000000
--- a/.vim/after/ftplugin/php.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-
-nnoremap <buffer> <C-j><C-l> :w<CR>:!php -l %<CR>
diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
index 2d70eab..fab3a52 100644
--- a/.vim/after/ftplugin/python.vim
+++ b/.vim/after/ftplugin/python.vim
@@ -1,6 +1,5 @@

 " PEP 8 Indent rule
-setl nosmartindent
 setl cindent
 setl textwidth=80
 setl colorcolumn=80
@@ -9,21 +8,3 @@ setl colorcolumn=80
 setl foldmethod=indent
 setl foldlevel=99

-"
-" sudo pip install pylint
-" syntax check には pylint と syntastic を使う
-" pyflakes と flake8 は Error と Warning が分かりにくいので微妙
-"
-" let g:flake8_ignore="E501,W293"
-" augroup PYTHON
-"   autocmd!
-"   autocmd PYTHON BufWritePost *.py call Flake8()
-" augroup END
-" nnoremap <buffer> <C-j><C-l> :call Flake8()<CR>
-"
-" nose + doctest の実行
-nnoremap <buffer> <C-j><C-k> :w!<CR>:!clear<CR>:!nosetests -v --with-doctest<CR>
-
-" interactive shell で実行
-nnoremap <buffer> <C-j><C-i> :!python -i %<CR>
-
diff --git a/.vim/after/ftplugin/ruby.vim b/.vim/after/ftplugin/ruby.vim
deleted file mode 100644
index bbc8241..0000000
--- a/.vim/after/ftplugin/ruby.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-
-nnoremap <buffer> <C-j><C-l> :w<CR>:!ruby -c %<CR>
diff --git a/.vimrc b/.vimrc
index 4ac2f0d..a004494 100644
--- a/.vimrc
+++ b/.vimrc
@@ -21,30 +21,15 @@
 " ftpluginを書く際の注意
 " http://whileimautomaton.net/2008/09/07213145
 "
-" 全体をインデント  gg=G
-" 全体を選択        ggVG
-"
 " オプションが最後にどこで設定されたか表示する
 " :verbose set tabstop?
 "
-" ターミナルからFinderを開く
-" open .
-"
 " vimからFinderを開く
 " :!open .
 "
-" 置換を繰り返す
-" http://vim-users.jp/2010/01/hack117/
-" :s
-" :&&
-" &
-"
 " sudoでファイル保存
 " :w !sudo tee >/dev/null %
 "
-" yss= <%= %>
-" yss- <%  %>
-"
 " :setなどのアウトプットに対して検索をかける
 " :Unite output:set
 "
@@ -74,21 +59,16 @@ Bundle 'gmarik/vundle'
 Bundle 'zefei/buftabs'
 Bundle 'vim-scripts/mru.vim'
 Bundle 'vim-scripts/sudo.vim'
-Bundle 'vim-scripts/matchit.zip'
 Bundle 'vim-scripts/vim-pad'
 Bundle 'Shougo/unite.vim'
 Bundle 'Shougo/vimproc'
 Bundle 'Shougo/vimfiler'
-Bundle 'tpope/vim-surround'
-Bundle 'tpope/vim-rails'
 Bundle 'thinca/vim-quickrun'
 Bundle 'thinca/vim-qfreplace'
-Bundle 'scrooloose/nerdtree'
 Bundle 'scrooloose/nerdcommenter'
 Bundle 'scrooloose/syntastic'
 Bundle 'banyan/recognize_charcode.vim'
 Bundle 'godlygeek/tabular'
-Bundle 'motemen/git-vim'
 Bundle 'kana/vim-textobj-user'
 Bundle 'kana/vim-textobj-indent.git'
 Bundle 'tomasr/molokai'
@@ -162,6 +142,16 @@ autocmd FileType * set formatoptions-=ro
 " インサートモードを抜ける時に:set nopaste
 autocmd InsertLeave * set nopaste

+" インデント
+autocmd FileType css        setlocal sw=2 sts=2 ts=2
+autocmd FileType html       setlocal sw=2 sts=2 ts=2
+autocmd FileType javascript setlocal sw=2 sts=2 ts=2
+autocmd FileType ruby       setlocal sw=2 sts=2 ts=2
+autocmd FileType haml       setlocal sw=2 sts=2 ts=2
+autocmd FileType vim        setlocal sw=2 sts=2 ts=2
+autocmd FileType yaml       setlocal sw=2 sts=2 ts=2
+autocmd FileType scala      setlocal sw=2 sts=2 ts=2
+
 "}}}

 "========================================
@@ -243,10 +233,6 @@ highlight Search         ctermbg=yellow
 "{{{

 "****************************************
-" nerdtree
-nnoremap    <Space>n         :NERDTree<CR>
-
-"****************************************
 " nerdcommenter
 let NERDSpaceDelims = 1
 nmap    <Space>o         <Plug>NERDCommenterToggle
@@ -260,9 +246,9 @@ vnoremap    <Space>t         :Tab/
 " syntastic
 let g:syntastic_quiet_warnings=1
 let g:syntastic_mode_map = {
-            \ 'mode': 'active',
-            \ 'active_filetypes' : ['php', 'python', 'ruby'],
-            \ 'passive_filetypes': [] }
+      \ 'mode': 'active',
+      \ 'active_filetypes' : ['php', 'python', 'ruby'],
+      \ 'passive_filetypes': [] }

 "****************************************
 " quickrun
@@ -300,9 +286,9 @@ nnoremap <silent> <Space>.  :<C-u>VimFilerBufferDir  -quit<CR>
 nnoremap <silent> <Space>c  :<C-u>VimFilerCurrentDir -quit<CR>

 if executable('grep')
-    let g:unite_source_grep_command = 'grep'
-    let g:unite_source_grep_default_opts = '-ERIn --color=never'
-    let g:unite_source_grep_recursive_opt = ''
+  let g:unite_source_grep_command = 'grep'
+  let g:unite_source_grep_default_opts = '-ERIn --color=never'
+  let g:unite_source_grep_recursive_opt = ''
 endif

 let g:vimfiler_as_default_explorer = 1
@@ -310,9 +296,9 @@ let g:vimfiler_safe_mode_by_default = 0

 autocmd FileType vimfiler call s:vimfiler_settings()
 function! s:vimfiler_settings()
-    nmap <silent><buffer><expr><CR> vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
-    nmap <silent><buffer><expr>o    vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
-    nmap <silent><buffer> q         <Plug>(vimfiler_exit)
+  nmap <silent><buffer><expr><CR> vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
+  nmap <silent><buffer><expr>o    vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
+  nmap <silent><buffer> q         <Plug>(vimfiler_exit)
 endfunction

 "}}}