Permalink
Browse files

Merge branch 'master' of http://github.com/akitsukada/dotfiles

  • Loading branch information...
2 parents 342b01b + 5a9a24a commit 461563c3ab0d5d7e3ecc888c844c95a90c3a9584 @akitsukada committed Sep 20, 2011
Showing with 24 additions and 11 deletions.
  1. +1 −0 .profile
  2. +9 −0 .screenrc
  3. +1 −1 .vim/bundle/neocomplcache
  4. +1 −1 .vim/bundle/unite.vim
  5. +1 −0 .vim/bundle/vimproc
  6. +1 −0 .vim/bundle/vimshell
  7. +1 −1 .vim/vundle
  8. +9 −8 .vimrc
View
@@ -3,6 +3,7 @@ alias ls='ls -G'
alias la='ls -la'
alias ll='ls -l'
alias r='rails'
+alias pu='phpunit'
alias javac="javac -J-Dfile.encoding=UTF8"
# MacPorts Installer addition on 2011-05-05_at_10:31:31: adding an appropriate PATH variable for use with MacPorts.
View
@@ -1,7 +1,16 @@
escape ^Tt
+term screen-256color
+zombie 
hardstatus alwayslastline "[%02c] %`%-w%{=b bw}%n %t%{-}%+w"
defencoding UTF-8
encoding UTF-8
termcapinfo * 'hs:ts=\E]2;:fs=\007:ds=\E]0;screen\007'
altscreen on
defscrollback 10000
+autodetach off
+
+# window resize
+bind r eval 'echo "Resize window"' 'command -c resize'
+bind -c resize ^] command
+bind -c resize j eval 'resize +1' 'command -c resize'
+bind -c resize k eval 'resize -1' 'command -c resize'
Submodule neocomplcache updated from 027d85 to 25c22e
Submodule unite.vim updated from 8be565 to b7a228
Submodule vimproc added at d44ec8
Submodule vimshell added at d2a2ef
Submodule vundle updated from 555b51 to cae6df
View
17 .vimrc
@@ -9,6 +9,8 @@ call vundle#rc()
Bundle 'gmarik/vundle'
Bundle 'Shougo/neocomplcache'
Bundle 'Shougo/unite.vim'
+Bundle 'Shougo/vimshell'
+Bundle 'Shougo/vimproc'
Bundle 'h1mesuke/unite-outline'
Bundle 'scrooloose/nerdcommenter'
Bundle 'tpope/vim-surround'
@@ -18,7 +20,6 @@ Bundle 'kana/vim-fakeclip'
" vim-scripts repos
Bundle 'rails.vim'
Bundle 'svn-diff.vim'
-Bundle 'vim-ruby'
" non github repos
filetype plugin indent on
@@ -27,18 +28,18 @@ filetype plugin indent on
" BasicSettings {{{
syntax on
-colorscheme desert
+colorscheme koehler
set nocompatible
set smartindent
set smarttab
set smartcase
set ignorecase
" これら以外の言語固有tab設定は~/.vim/indent/$lang.vim
-"set expandtab
-set tabstop=2 " ファイル中のタブ文字の表示幅
-set shiftwidth=2 " 自動で挿入されるインデント幅
-set softtabstop=2 " タブ押下時に挿入されるスペース数
+set expandtab
+set tabstop=4 " ファイル中のタブ文字の表示幅
+set shiftwidth=4 " 自動で挿入されるインデント幅
+set softtabstop=4 " タブ押下時に挿入されるスペース数
set number
set hlsearch
@@ -52,8 +53,8 @@ set noswapfile
set wildmenu
" TABと行末spaceの可視化
-set list
-set listchars=tab:>-,trail:-,nbsp:%,extends:>,precedes:<
+set nolist
+"set listchars=tab:>-,trail:-,nbsp:%,extends:>,precedes:<
" ステータスラインの表示内容
set statusline=%{expand('%:p:t')}\ %<\(%{SnipMid(expand('%:p:h'),80-len(expand('%:p:t')),'...')}\)%=\ %m%r%y%w%{'['.(&fenc!=''?&fenc:&enc).']['.&ff.']'}[%3l,%3c]

0 comments on commit 461563c

Please sign in to comment.