[from now] 2013/10/20 18:04:28

diff --git a/setup.sh b/setup.sh
index 6e71ec8..6e5e740 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,29 +8,29 @@ echo "l , s, c, u or w"
 read lorsoruorw
 while :
 do
-    if [ "${lorsoruorw}" = "l" ]; then
-        tmux=".tmux.conf"
-        #screen=".screenrc"
-        break
-    elif [ "${lorsoruorw}" = "s" ]; then
-        tmux=".tmux.conf_server"
-        #screen=".screenrc_mini"
-        break
-    elif [ "${lorsoruorw}" = "w" ]; then
-        screen=".screenrc_win"
-        break
-    elif [ "${lorsoruorw}" = "u" ]; then
-        tmux=".tmux.conf_linux"
-        #screen=".screenrc_ubuntu"
-        break
-    elif [ "${lorsoruorw}" = "c" ]; then
-        tmux=".tmux.conf_linux"
-        #screen=".screenrc_ubuntu"
-        break
-    else
-        echo "Press l , s , u or w"
-        read lorsoruorw
-    fi
+  if [ "${lorsoruorw}" = "l" ]; then
+    tmux=".tmux.conf"
+    #screen=".screenrc"
+    break
+  elif [ "${lorsoruorw}" = "s" ]; then
+    tmux=".tmux.conf_server"
+    #screen=".screenrc_mini"
+    break
+  elif [ "${lorsoruorw}" = "w" ]; then
+    screen=".screenrc_win"
+    break
+  elif [ "${lorsoruorw}" = "u" ]; then
+    tmux=".tmux.conf_linux"
+    #screen=".screenrc_ubuntu"
+    break
+  elif [ "${lorsoruorw}" = "c" ]; then
+    tmux=".tmux.conf_linux"
+    #screen=".screenrc_ubuntu"
+    break
+  else
+    echo "Press l , s , u or w"
+    read lorsoruorw
+  fi
 done
 # tmux
 rm ${HOME}/.tmux.conf
@@ -43,8 +43,8 @@ cd zsh
 ZSH_FILE=( .zshenv )
 for file in ${ZSH_FILE[@]}
 do
-    rm ${HOME}/${file}
-    ln -s ${PWD}/${file} ${HOME}/${file}
+  rm ${HOME}/${file}
+  ln -s ${PWD}/${file} ${HOME}/${file}
 done
 cd ../

@@ -57,19 +57,19 @@ cd vim
 VIM_FILE=( .vimrc .gvimrc .vim )
 for file in ${VIM_FILE[@]}
 do
-    rm ${HOME}/${file}
-    ln -s ${PWD}/${file} ${HOME}/${file}
+  rm ${HOME}/${file}
+  ln -s ${PWD}/${file} ${HOME}/${file}
 done
 cd ../

 if [ ! -d vim/.vim/back ]; then
-    mkdir -p vim/.vim/back
+  mkdir -p vim/.vim/back
 fi

 # vimperator
 cd vimperator
 if [ ! -d ${HOME}/.vimperator/plugin ]; then
-    mkdir -p ${HOME}/.vimperator/plugin
+  mkdir -p ${HOME}/.vimperator/plugin
 fi
 git clone git://github.com/caisui/vimperator.git ${HOME}/.vimperator/caisui
 git clone git://gist.github.com/377348.git ${HOME}/.vimperator/377348
@@ -90,8 +90,8 @@ DOT_FILES=( .vrapperrc .gemrc)

 for file in ${DOT_FILES[@]}
 do
-    rm ${HOME}/${file}
-    ln -s ${PWD}/${file} ${HOME}/${file}
+  rm ${HOME}/${file}
+  ln -s ${PWD}/${file} ${HOME}/${file}
 done

 # KeyRemap4MacBook
@@ -120,34 +120,36 @@ git config --global core.editor vim

 # install homebrew
 if [ "${OSTYPE}" != "#{OSTYPE#darwin}" ]; then
-    ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
-    brew install reattach-to-user-namespace
-    brew install --disable-etcdir zsh
-    brew install lv
-    brew install git
-    brew install git-now
-    brew install tmux
-    brew install readline
-    brew install openssl
-    brew install coreutils
-    brew install rmtrash
-    brew install cmatrix
-    brew install zsh-completions
-    brew install mosh
-    brew install nkf
-    brew install rbenv ruby-build rbenv-gemset rbenv-binstubs
-    brew install macvim --with-cscope --with-lua --HEAD
-    brew install go
-    ln -s /usr/local/Cellar/macvim/HEAD/MacVim.app /Applications
-
-    brew tap phinze/homebrew-cask
-    brew install brew-cask
-    brew cask install google-chrome
-    brew cask install firefox
-    brew cask install right-zoom
-    brew cask install app-cleaner
-    brew cask install keyremap4macbook
-    brew cask install caffeine
+  ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
+  brew install reattach-to-user-namespace
+  brew install --disable-etcdir zsh
+  brew install lv
+  brew install git
+  brew install git-now
+  brew install tmux
+  brew install readline
+  brew install openssl
+  brew install coreutils
+  brew install rmtrash
+  brew install cmatrix
+  brew install zsh-completions
+  brew install mosh
+  brew install nkf
+  brew install rbenv ruby-build rbenv-gemset rbenv-binstubs
+  brew install macvim --with-cscope --with-lua --HEAD
+  brew install go
+  ln -s /usr/local/Cellar/macvim/HEAD/MacVim.app /Applications
+
+  brew tap phinze/homebrew-cask
+  brew install brew-cask
+  brew cask install google-chrome
+  brew cask install firefox
+  brew cask install right-zoom
+  brew cask install app-cleaner
+  brew cask install keyremap4macbook
+  brew cask install caffeine
+  brew cask install bettertouchtool
+  brew cask install xld
 fi

 # scripts git clone
diff --git a/vim/.gvimrc b/vim/.gvimrc
index 784a395..5999b21 100755
--- a/vim/.gvimrc
+++ b/vim/.gvimrc
@@ -48,8 +48,7 @@ set cmdheight=2

 "カラー設定:
 if s:is_darwin
-    "colorscheme molokai
-    colorscheme landscape
+    colorscheme molokai
     set background=dark
 else
     "colorscheme molokai
diff --git a/vim/.vimrc b/vim/.vimrc
index ff6e7f9..27d5fa8 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -792,7 +792,7 @@ set t_Co=256
 "set background=light
 set background=dark
 "let g:solarized_termcolors=256
-colorscheme landscape
+colorscheme molokai
 let g:molokai_original=1
 "===================================================================================}}}

@@ -1025,43 +1025,43 @@ nnoremap [Space]bi :<C-u>NeoBundleInstall!<CR>

 " ligntline {{{
 if s:is_windows
-    let g:lightline = {
-          \ 'colorscheme': 'landscape',
-          \ 'mode_map': { 'c': 'NORMAL' },
-          \ 'active': {
-          \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ]
-          \ },
-          \ 'component_function': {
-          \   'modified': 'MyModified',
-          \   'readonly': 'MyReadonly',
-          \   'fugitive': 'MyFugitive',
-          \   'filename': 'MyFilename',
-          \   'fileformat': 'MyFileformat',
-          \   'filetype': 'MyFiletype',
-          \   'fileencoding': 'MyFileencoding',
-          \   'mode': 'MyMode',
-          \ }
-          \ }
+  let g:lightline = {
+        \ 'colorscheme': 'landscape',
+        \ 'mode_map': { 'c': 'NORMAL' },
+        \ 'active': {
+        \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ]
+        \ },
+        \ 'component_function': {
+        \   'modified': 'MyModified',
+        \   'readonly': 'MyReadonly',
+        \   'fugitive': 'MyFugitive',
+        \   'filename': 'MyFilename',
+        \   'fileformat': 'MyFileformat',
+        \   'filetype': 'MyFiletype',
+        \   'fileencoding': 'MyFileencoding',
+        \   'mode': 'MyMode',
+        \ }
+        \ }
 else
-    let g:lightline = {
-          \ 'colorscheme': 'jellybeans',
-          \ 'mode_map': { 'c': 'NORMAL' },
-          \ 'active': {
-          \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ]
-          \ },
-          \ 'component_function': {
-          \   'modified': 'MyModified',
-          \   'readonly': 'MyReadonly',
-          \   'fugitive': 'MyFugitive',
-          \   'filename': 'MyFilename',
-          \   'fileformat': 'MyFileformat',
-          \   'filetype': 'MyFiletype',
-          \   'fileencoding': 'MyFileencoding',
-          \   'mode': 'MyMode',
-          \ },
-          \ 'separator': { 'left': '⮀', 'right': '⮂' },
-          \ 'subseparator': { 'left': '⮁', 'right': '⮃' }
-          \ }
+  let g:lightline = {
+        \ 'colorscheme': 'wombat',
+        \ 'mode_map': { 'c': 'NORMAL' },
+        \ 'active': {
+        \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ]
+        \ },
+        \ 'component_function': {
+        \   'modified': 'MyModified',
+        \   'readonly': 'MyReadonly',
+        \   'fugitive': 'MyFugitive',
+        \   'filename': 'MyFilename',
+        \   'fileformat': 'MyFileformat',
+        \   'filetype': 'MyFiletype',
+        \   'fileencoding': 'MyFileencoding',
+        \   'mode': 'MyMode',
+        \ },
+        \ 'separator': { 'left': '⮀', 'right': '⮂' },
+        \ 'subseparator': { 'left': '⮁', 'right': '⮃' }
+        \ }
 endif

 function! MyModified()
@@ -2189,12 +2189,8 @@ endif
 " go {{{
 let s:hooks = neobundle#get_hooks("vim-golang")
 function! s:hooks.on_source(bundle)
-  filetype off
-  filetype plugin indent off
   set rtp+=$GOROOT/misc/vim
   exe "set rtp+=".globpath($GOPATH, "src/github.com/nsf/gocode/vim")
-  filetype plugin indent on
-  syntax on
   setl completeopt=menu,preview
   " golint
   exe "set rtp+=" . globpath($GOPATH, "src/github.com/golang/lint/misc/vim")
@@ -2379,8 +2375,8 @@ nnoremap <silent> [Space]eg  :<C-u>tabedit $MYGVIMRC<CR>
 "Vim-users.jp - Hack #78: CSVの特定のカラムをハイライトする {{{
 "http://vim-users.jp/2009/09/hack78/
 function! CSVH(x)
-    execute 'match Keyword /^\([^,]*,\)\{'.a:x.'}\zs[^,]*/'
-    execute 'normal ^'.a:x.'f,'
+  execute 'match Keyword /^\([^,]*,\)\{'.a:x.'}\zs[^,]*/'
+  execute 'normal ^'.a:x.'f,'
 endfunction
 command! -nargs=1 Csvhl :call CSVH(<args>)
 " }}}
@@ -2398,10 +2394,10 @@ command! -count -nargs=1 ContinuousNumber let c = col('.')
 " http://vim-users.jp/2011/02/hack202/
 autocmd MyAutoCmd BufWritePre * call s:auto_mkdir(expand('<afile>:p:h'), v:cmdbang)
 function! s:auto_mkdir(dir, force)
-    if !isdirectory(a:dir) && (a:force ||
-                \    input(printf('"%s" does not exist. Create? [y/N]', a:dir)) =~? '^y\%[es]$')
-        call mkdir(iconv(a:dir, &encoding, &termencoding), 'p')
-    endif
+  if !isdirectory(a:dir) && (a:force ||
+        \    input(printf('"%s" does not exist. Create? [y/N]', a:dir)) =~? '^y\%[es]$')
+    call mkdir(iconv(a:dir, &encoding, &termencoding), 'p')
+  endif
 endfunction
 " }}}

@@ -2441,28 +2437,28 @@ autocmd MyAutoCmd WinLeave * call s:auto_cursorline('WinLeave')

 let s:cursorline_lock = 0
 function! s:auto_cursorline(event)
-    if a:event ==# 'WinEnter'
-        setlocal cursorline
-        setlocal cursorcolumn
-        let s:cursorline_lock = 2
-    elseif a:event ==# 'WinLeave'
+  if a:event ==# 'WinEnter'
+    setlocal cursorline
+    setlocal cursorcolumn
+    let s:cursorline_lock = 2
+  elseif a:event ==# 'WinLeave'
+    setlocal nocursorline
+    setlocal nocursorcolumn
+  elseif a:event ==# 'CursorMoved'
+    if s:cursorline_lock
+      if 1 < s:cursorline_lock
+        let s:cursorline_lock = 1
+      else
         setlocal nocursorline
         setlocal nocursorcolumn
-    elseif a:event ==# 'CursorMoved'
-        if s:cursorline_lock
-            if 1 < s:cursorline_lock
-                let s:cursorline_lock = 1
-            else
-                setlocal nocursorline
-                setlocal nocursorcolumn
-                let s:cursorline_lock = 0
-            endif
-        endif
-    elseif a:event ==# 'CursorHold'
-        setlocal cursorline
-        setlocal cursorcolumn
-        let s:cursorline_lock = 1
+        let s:cursorline_lock = 0
+      endif
     endif
+  elseif a:event ==# 'CursorHold'
+    setlocal cursorline
+    setlocal cursorcolumn
+    let s:cursorline_lock = 1
+  endif
 endfunction
 " }}}