Changeset 16024

Timestamp:

07/19/08 13:45:11 (5 years ago)

Author:

cho45

Message:

dotfiles 更新

Location:

dotfiles

Files:

• rubygems/cho45-gemrc (modified) (1 diff)
• vim/cho45/.vimrc (modified) (2 diffs)
• vim/cho45/sortcss (modified) (1 diff)
• zsh/cho45/.zsh/mine.zshrc (modified) (2 diffs)
• zsh/cho45/.zshrc (modified) (1 diff)

dotfiles/rubygems/cho45-gemrc

@@ -1 +1 @@
 --- 
-:benchmark: false
 :update_sources: true
-:verbose: true
+:bulk_threshold: 1000
 :sources: 
 - http://gems.rubyforge.org
+- http://gems.github.com
+:verbose: true
+:benchmark: false
 :backtrace: false
 rdoc: --template ~/coderepos/lang/ruby/rdoc/generators/template/html/resh/resh.rb --inline-source
-:bulk_threshold: 1000

dotfiles/vim/cho45/.vimrc

@@ -264 +264 @@
 " {{{ Autocompletion using the TAB key
 
-"" This function determines, wether we are on the start of the line text (then tab indents) or
-"" if we want to try autocompletion
-"function! InsertTabWrapper()
-"       let col = col('.') - 1
-"       if !col || getline('.')[col - 1] !~ '\k'
-"               return "\<TAB>"
-"       else
-"               if pumvisible()
-"                       return "\<C-N>"
-"               else
-"                       return "\<C-N>\<C-P>"
-"               end
-"       endif
-"endfunction
-"" Remap the tab key to select action with InsertTabWrapper
-"inoremap <tab> <c-r>=InsertTabWrapper()<cr>
+" This function determines, wether we are on the start of the line text (then tab indents) or
+" if we want to try autocompletion
+function! InsertTabWrapper()
+        let col = col('.') - 1
+        if !col || getline('.')[col - 1] !~ '\k'
+                return "\<TAB>"
+        else
+                if pumvisible()
+                        return "\<C-N>"
+                else
+                        return "\<C-N>\<C-P>"
+                end
+        endif
+endfunction
+" Remap the tab key to select action with InsertTabWrapper
+inoremap <tab> <c-r>=InsertTabWrapper()<cr>
 
 " }}} Autocompletion using the TAB key
@@ -290 +290 @@
 
 let g:AutoComplPop_CompleteOption = '.,w,b,k'
-let g:snippetsEmu_key = "<TAB>"
+let g:snippetsEmu_key = "<C-A>"
 
 autocmd BufNewFile,BufRead *.io set filetype=io

dotfiles/vim/cho45/sortcss

@@ -138 +138 @@
 end
 
-result = ARGF.read.gsub(%r{/\*([^*]*)\*/}m, '').to_a.map {|l| l.chomp }.sort_by do |line|
+result = ARGF.read.gsub(%r{/\*([^*]*)\*/}m, '').to_a.map {|l| l.chomp.sub(/\s*:\s*/, ": ") }.sort_by do |line|
         property_order line
 end

dotfiles/zsh/cho45/.zsh/mine.zshrc

@@ -98 +98 @@
 
 function git () {
-        if [ -e '.svn' ]; then
-                command svn $@ | $PAGER
+        if [[ -e '.svn' ]]; then
+                if [[ $1 == "log" ]]; then
+                        command svn $@ | $PAGER
+                else
+                        command svn $@
+                fi
                 echo
                 echo "x| _ |x < .svn があったので svn コマンドにしました!"
         else
-                command git $@
+                if [[ $1 == "" ]]; then
+                        # git ってだけうったときは status 表示
+                        command git branch -a --verbose
+                        command git status
+                elif [[ $1 == "log" ]]; then
+                        # 常に diff を表示してほしい
+                        command git log -p ${@[2, -1]}
+                else
+                        command git $@
+                fi
+        fi
+}
+
+function anco () {
+        if command git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
+                command git grep $@
+        else
+                command ack --all --with-filename $@ | $PAGER
         fi
 }
@@ -115 +136 @@
 # ホストごとの設定を読みこむ
 h="${HOST%%.*}"
-if [ -f "$HOME/.zsh/host-$h.zshrc" ]
-then
+if [[ -f "$HOME/.zsh/host-$h.zshrc" ]]; then
         source "$HOME/.zsh/host-$h.zshrc"
 fi

dotfiles/zsh/cho45/.zshrc

@@ -21 +21 @@
 help! () { zle -M "E478: Don't panic!" }
 zle -N help!
+
+autoload zargs
 
 # 日本語用