[from now] 2014/03/14 18:03:33

diff --git a/.tmux.conf b/.tmux.conf
index fdf1b3d..821c10d 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -22,6 +22,18 @@ unbind C-b
 unbind C-z
 unbind [
 unbind ]
+unbind Up
+unbind Down
+unbind Left
+unbind Right
+unbind M-Up
+unbind M-Down
+unbind M-Left
+unbind M-Right
+unbind C-Up
+unbind C-Down
+unbind C-Left
+unbind C-Right

 bind '"' split-window -vc "#{pane_current_path}"
 bind '%' split-window -hc "#{pane_current_path}"
@@ -34,7 +46,7 @@ bind C-p previous-window
 bind C-r source $HOME/.tmux.conf\; display "Reload!"
 bind C-t copy-mode
 bind p paste-buffer
-bind -r k resize-pane -U 1
-bind -r j resize-pane -D 1
-bind -r h resize-pane -L 1
-bind -r l resize-pane -R 1
+bind -r C-k resize-pane -U 1
+bind -r C-j resize-pane -D 1
+bind -r C-h resize-pane -L 1
+bind -r C-l resize-pane -R 1
diff --git a/.vim/neobundle.vim b/.vim/neobundle.vim
new file mode 100644
index 0000000..755cf07
--- /dev/null
+++ b/.vim/neobundle.vim
@@ -0,0 +1,30 @@
+if has('vim_starting')
+  set nocompatible
+  set runtimepath+=~/.vim/bundle/neobundle.vim/
+endif
+
+call neobundle#rc(expand('~/.vim/bundle/'))
+
+let g:neobundle_default_git_protocol='https'
+
+NeoBundleFetch 'Shougo/neobundle.vim'
+
+NeoBundle 'Shougo/neocomplcache'
+NeoBundle 'Shougo/neomru.vim'
+NeoBundle 'Shougo/neosnippet'
+NeoBundle 'Shougo/neosnippet-snippets'
+NeoBundle 'Shougo/unite.vim'
+NeoBundle 'Shougo/vimproc'
+NeoBundle 'altercation/vim-colors-solarized'
+NeoBundle 'itchyny/lightline.vim'
+NeoBundle 'junegunn/vim-easy-align'
+NeoBundle 'thinca/vim-quickrun'
+NeoBundle 'tomtom/tcomment_vim'
+NeoBundle 'tpope/vim-fugitive'
+NeoBundle 'tpope/vim-surround'
+NeoBundle 'vim-ruby/vim-ruby'
+NeoBundle 'vim-scripts/L9'
+
+filetype plugin indent on
+
+NeoBundleCheck
diff --git a/.vim/neobundle.vimrc b/.vim/neobundle.vimrc
deleted file mode 100644
index 755cf07..0000000
--- a/.vim/neobundle.vimrc
+++ /dev/null
@@ -1,30 +0,0 @@
-if has('vim_starting')
-  set nocompatible
-  set runtimepath+=~/.vim/bundle/neobundle.vim/
-endif
-
-call neobundle#rc(expand('~/.vim/bundle/'))
-
-let g:neobundle_default_git_protocol='https'
-
-NeoBundleFetch 'Shougo/neobundle.vim'
-
-NeoBundle 'Shougo/neocomplcache'
-NeoBundle 'Shougo/neomru.vim'
-NeoBundle 'Shougo/neosnippet'
-NeoBundle 'Shougo/neosnippet-snippets'
-NeoBundle 'Shougo/unite.vim'
-NeoBundle 'Shougo/vimproc'
-NeoBundle 'altercation/vim-colors-solarized'
-NeoBundle 'itchyny/lightline.vim'
-NeoBundle 'junegunn/vim-easy-align'
-NeoBundle 'thinca/vim-quickrun'
-NeoBundle 'tomtom/tcomment_vim'
-NeoBundle 'tpope/vim-fugitive'
-NeoBundle 'tpope/vim-surround'
-NeoBundle 'vim-ruby/vim-ruby'
-NeoBundle 'vim-scripts/L9'
-
-filetype plugin indent on
-
-NeoBundleCheck
diff --git a/.vim/neocomplcache.vim b/.vim/neocomplcache.vim
new file mode 100644
index 0000000..16bee7f
--- /dev/null
+++ b/.vim/neocomplcache.vim
@@ -0,0 +1,47 @@
+let g:acp_enableAtStartup                        = 0
+let g:neocomplcache_enable_at_startup            = 1
+let g:neocomplcache_enable_smart_case            = 1
+let g:neocomplcache_min_syntax_length            = 2
+let g:neocomplcache_lock_buffer_name_pattern     = '\*ku\*'
+let g:neocomplcache_enable_camel_case_completion = 1
+let g:neocomplcache_enable_underbar_completion   = 1
+
+let g:neocomplcache_dictionary_filetype_lists = {
+      \ 'default' : '',
+      \ 'vimshell' : $HOME.'/.vimshell_hist',
+      \ 'scheme' : $HOME.'/.gosh_completions'
+      \ }
+
+if !exists('g:neocomplcache_keyword_patterns')
+  let g:neocomplcache_keyword_patterns = {}
+endif
+let g:neocomplcache_keyword_patterns['default'] = '\h\w*'
+
+inoremap <expr><C-g> neocomplcache#undo_completion()
+inoremap <expr><C-l> neocomplcache#complete_common_string()
+
+" <CR>: close popup and save indent.
+inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
+function! s:my_cr_function()
+  return neocomplcache#smart_close_popup() . "\<CR>"
+endfunction
+inoremap <expr><TAB>   pumvisible() ? "\<C-n>" : "\<TAB>"
+inoremap <expr><C-h>   neocomplcache#smart_close_popup()."\<C-h>"
+inoremap <expr><BS>    neocomplcache#smart_close_popup()."\<C-h>"
+inoremap <expr><C-y>   neocomplcache#close_popup()
+inoremap <expr><C-e>   neocomplcache#cancel_popup()
+inoremap <expr><Space> pumvisible() ? neocomplcache#close_popup() : "\<Space>"
+
+autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
+autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
+autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
+autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
+autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
+
+if !exists('g:neocomplcache_omni_patterns')
+  let g:neocomplcache_omni_patterns = {}
+endif
+let g:neocomplcache_omni_patterns.php  = '[^. \t]->\h\w*\|\h\w*::'
+let g:neocomplcache_omni_patterns.c    = '[^.[:digit:] *\t]\%(\.\|->\)'
+let g:neocomplcache_omni_patterns.cpp  = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::'
+let g:neocomplcache_omni_patterns.perl = '\h\w*->\h\w*\|\h\w*::'
diff --git a/.vim/neocomplcache.vimrc b/.vim/neocomplcache.vimrc
deleted file mode 100644
index 16bee7f..0000000
--- a/.vim/neocomplcache.vimrc
+++ /dev/null
@@ -1,47 +0,0 @@
-let g:acp_enableAtStartup                        = 0
-let g:neocomplcache_enable_at_startup            = 1
-let g:neocomplcache_enable_smart_case            = 1
-let g:neocomplcache_min_syntax_length            = 2
-let g:neocomplcache_lock_buffer_name_pattern     = '\*ku\*'
-let g:neocomplcache_enable_camel_case_completion = 1
-let g:neocomplcache_enable_underbar_completion   = 1
-
-let g:neocomplcache_dictionary_filetype_lists = {
-      \ 'default' : '',
-      \ 'vimshell' : $HOME.'/.vimshell_hist',
-      \ 'scheme' : $HOME.'/.gosh_completions'
-      \ }
-
-if !exists('g:neocomplcache_keyword_patterns')
-  let g:neocomplcache_keyword_patterns = {}
-endif
-let g:neocomplcache_keyword_patterns['default'] = '\h\w*'
-
-inoremap <expr><C-g> neocomplcache#undo_completion()
-inoremap <expr><C-l> neocomplcache#complete_common_string()
-
-" <CR>: close popup and save indent.
-inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
-function! s:my_cr_function()
-  return neocomplcache#smart_close_popup() . "\<CR>"
-endfunction
-inoremap <expr><TAB>   pumvisible() ? "\<C-n>" : "\<TAB>"
-inoremap <expr><C-h>   neocomplcache#smart_close_popup()."\<C-h>"
-inoremap <expr><BS>    neocomplcache#smart_close_popup()."\<C-h>"
-inoremap <expr><C-y>   neocomplcache#close_popup()
-inoremap <expr><C-e>   neocomplcache#cancel_popup()
-inoremap <expr><Space> pumvisible() ? neocomplcache#close_popup() : "\<Space>"
-
-autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
-autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
-autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
-autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
-autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
-
-if !exists('g:neocomplcache_omni_patterns')
-  let g:neocomplcache_omni_patterns = {}
-endif
-let g:neocomplcache_omni_patterns.php  = '[^. \t]->\h\w*\|\h\w*::'
-let g:neocomplcache_omni_patterns.c    = '[^.[:digit:] *\t]\%(\.\|->\)'
-let g:neocomplcache_omni_patterns.cpp  = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::'
-let g:neocomplcache_omni_patterns.perl = '\h\w*->\h\w*\|\h\w*::'
diff --git a/.vim/neosnippet.vim b/.vim/neosnippet.vim
new file mode 100644
index 0000000..ad656db
--- /dev/null
+++ b/.vim/neosnippet.vim
@@ -0,0 +1,18 @@
+imap <C-k> <Plug>(neosnippet_expand_or_jump)
+smap <C-k> <Plug>(neosnippet_expand_or_jump)
+xmap <C-k> <Plug>(neosnippet_expand_target)
+
+" SuperTab like snippets behavior.
+imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+      \ "\<Plug>(neosnippet_expand_or_jump)"
+      \: pumvisible() ? "\<C-n>" : "\<TAB>"
+smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+      \ "\<Plug>(neosnippet_expand_or_jump)"
+      \: "\<TAB>"
+
+if has('conceal')
+  set conceallevel=2 concealcursor=i
+endif
+
+let g:neosnippet#enable_snipmate_compatibility = 1
+let g:neosnippet#snippets_directory='~/.vim/snippets'
diff --git a/.vim/neosnippet.vimrc b/.vim/neosnippet.vimrc
deleted file mode 100644
index ad656db..0000000
--- a/.vim/neosnippet.vimrc
+++ /dev/null
@@ -1,18 +0,0 @@
-imap <C-k> <Plug>(neosnippet_expand_or_jump)
-smap <C-k> <Plug>(neosnippet_expand_or_jump)
-xmap <C-k> <Plug>(neosnippet_expand_target)
-
-" SuperTab like snippets behavior.
-imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
-      \ "\<Plug>(neosnippet_expand_or_jump)"
-      \: pumvisible() ? "\<C-n>" : "\<TAB>"
-smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
-      \ "\<Plug>(neosnippet_expand_or_jump)"
-      \: "\<TAB>"
-
-if has('conceal')
-  set conceallevel=2 concealcursor=i
-endif
-
-let g:neosnippet#enable_snipmate_compatibility = 1
-let g:neosnippet#snippets_directory='~/.vim/snippets'
diff --git a/.vim/solarized.vim b/.vim/solarized.vim
new file mode 100644
index 0000000..7d5b044
--- /dev/null
+++ b/.vim/solarized.vim
@@ -0,0 +1,12 @@
+set background=light
+colorscheme solarized
+let g:solarized_termcolors = 256
+let g:solarized_termtrans  = 1
+let g:solarized_degrade    = 0
+let g:solarized_bold       = 0
+let g:solarized_underline  = 0
+let g:solarized_italic     = 0
+let g:solarized_contrast   = "normal"
+let g:solarized_visibility = "normal"
+
+let g:lightline = {'colorscheme': 'solarized'}
diff --git a/.vim/solarized.vimrc b/.vim/solarized.vimrc
deleted file mode 100644
index 7d5b044..0000000
--- a/.vim/solarized.vimrc
+++ /dev/null
@@ -1,12 +0,0 @@
-set background=light
-colorscheme solarized
-let g:solarized_termcolors = 256
-let g:solarized_termtrans  = 1
-let g:solarized_degrade    = 0
-let g:solarized_bold       = 0
-let g:solarized_underline  = 0
-let g:solarized_italic     = 0
-let g:solarized_contrast   = "normal"
-let g:solarized_visibility = "normal"
-
-let g:lightline = {'colorscheme': 'solarized'}
diff --git a/.vimrc b/.vimrc
index 7daf301..c919c61 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,7 +1,7 @@
-source $HOME/.vim/neobundle.vimrc
-source $HOME/.vim/neocomplcache.vimrc
-source $HOME/.vim/neosnippet.vimrc
-source $HOME/.vim/solarized.vimrc
+source $HOME/.vim/neobundle.vim
+source $HOME/.vim/neocomplcache.vim
+source $HOME/.vim/neosnippet.vim
+source $HOME/.vim/solarized.vim

 " chmod +x
@@ -20,21 +20,22 @@ augroup filetypedetect
   autocmd FileType html  setlocal ts=2 sw=2 sts=2
   autocmd FileType css   setlocal ts=2 sw=2 sts=2
   autocmd FileType yaml  setlocal ts=2 sw=2 sts=2
+  autocmd BufNewFile,BufRead *.t  set filetype=perl
+  autocmd BufNewFile,BufRead *.md set filetype=markdown
 augroup END
-autocmd BufNewFile,BufRead *.t setf perl

-nnoremap <C-K> <C-W>+
-nnoremap <C-J> <C-W>-
-nnoremap <C-H> <C-W><
-nnoremap <C-L> <C-W>>
-nnoremap <C-B> :Unite buffer<CR>
+
+let g:unite_source_history_yank_enable=1
+nnoremap <C-B> :<C-U>Unite buffer<CR>
+nnoremap <C-N> :<C-U>Unite file -start-insert<CR>
+nnoremap <C-Z> :<C-U>Unite file_mru<CR>
+nnoremap <C-P> :<C-U>Unite register history/yank<CR>
+nnoremap <C-R> :<C-U>source $HOME/.vimrc<CR>:echomsg "Reload!"<CR>
+
 inoremap <C-B> <ESC>:Unite buffer<CR>
-nnoremap <C-N> :Unite file -start-insert<CR>
-nnoremap <C-Z> :Unite file_mru<CR>
+
 vmap <Enter> <Plug>(EasyAlign)

-let g:unite_source_history_yank_enable=1
-nnoremap <C-P> :Unite register history/yank<CR>

 syntax on
 set number
[from now] 2014/03/14 21:34:25

diff --git a/.vimrc b/.vimrc
index c919c61..aa7cde3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -30,7 +30,7 @@ nnoremap <C-B> :<C-U>Unite buffer<CR>
 nnoremap <C-N> :<C-U>Unite file -start-insert<CR>
 nnoremap <C-Z> :<C-U>Unite file_mru<CR>
 nnoremap <C-P> :<C-U>Unite register history/yank<CR>
-nnoremap <C-R> :<C-U>source $HOME/.vimrc<CR>:echomsg "Reload!"<CR>
+nnoremap ,r    :<C-U>source $HOME/.vimrc<CR>:echomsg "Reload!"<CR>

 inoremap <C-B> <ESC>:Unite buffer<CR>
[from now] 2014/03/14 21:37:55

diff --git a/.gitconfig b/.gitconfig
index 540c405..621bed7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,7 +7,7 @@
     ci  = commit
     co  = checkout
     st  = status
-    l   = log --graph --pretty=format:\"%C(yellow)[%ci] %C(blue)%h %C(magenta)%an %C(cyan)%s\" --stat
+    l   = log --graph --pretty=format:\"%C(yellow)[%ci] %C(blue)%h %C(magenta)%an %C(cyan)%s\"
 [push]
     default = matching
 [core]
[from now] 2014/03/19 19:19:19

diff --git a/.zshrc b/.zshrc
index ecff4a4..942221b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -114,7 +114,7 @@ fi
 # tmux
 TMUX_SESSION='mahalo'
 if tmux has -t $TMUX_SESSION > /dev/null 2>&1 ; then
-  [[ -z "$TMUX" ]] && tmux a -t $TMUX_SESSION
+  [[ -z "$TMUX" ]] && tmux a -d -t $TMUX_SESSION
 else
   tmux new -s $TMUX_SESSION
 fi