dotadd dotinstall dotless/bin/chelu/gcalc dotless/bin/chelu/myip dotless/bin/chelu/sp dotless/bin/chelu/spotlight.disable dotless/bin/chelu/spotlight.enable dotless/bin/chelu/spt dotless/bin/chelu/tt dotless/bin/chelu/whichcat dotless/bin/chelu/whichg dotless/bin/chelu/ws/capinfos dotless/bin/chelu/ws/dftest dotless/bin/chelu/ws/dumpcap dotless/bin/chelu/ws/editcap dotless/bin/chelu/ws/idl2wrs dotless/bin/chelu/ws/mergecap dotless/bin/chelu/ws/randpkt dotless/bin/chelu/ws/rawshark dotless/bin/chelu/ws/text2pcap dotless/bin/chelu/ws/tshark dotless/bin/chelu/ws/wireshark dotless/bin/y2racc dotted/gitk dotted/vimperatorrc @@ -1,3 +1,7 @@ +#tmp +alias pls="punch log symbolya" +alias ack="ack -i -a" + # common alias vi="v" alias vim="v" @@ -5,12 +9,20 @@ alias gvim="g" alias c="clear" alias l="ls -AGlFT" alias lt="ls -AGlFTtr" +alias g?="grep -e $1" +#alias cd="cd && git status" # bash alias reload="source ~/.profile" alias rc='v ~/.profile && source ~/.profile' alias lc="cl" function cl() { cd "$@" && l; } +function cs () { + cd "$@" + if [ -n "$(git status 2>/dev/null)" ]; then + echo "$(git status 2>/dev/null)" + fi +} #function cl () { # if [ $# = 0 ]; then # cd && l @@ -31,9 +43,11 @@ alias ttop='top -ocpu -R -F -s 2 -n30' #fs [alias for "find . -wholename '*.svn' -prune -o -type f -print0 | xargs -0 grep -li"] # git svn -alias gs="git svn" -alias gsr="git svn rebase" -alias gsd="git svn dcommit" +# alias gs="git svn" +# alias gsr="git svn rebase" +# alias gsd="git svn dcommit" +alias gss="git stash save" +alias gsp="git stash pop" # git alias gl="git log" @@ -62,6 +76,7 @@ function gco { } # rails +alias rake?="rake -T | g? $1" alias ms="mongrel_rails start" alias mig="rake db:migrate" alias migt="rake db:migrate RAILS_ENV=test" dotless/bin/aliases @@ -24,6 +24,11 @@ ARGV.each do |arg| } end +puts "=> first run" +puts "=> #{command}" +system(command) +puts "=> done" + puts "Watching #{files.keys.join(', ')}\n\nFiles: #{files.keys.length}" trap('INT') do @@ -42,7 +47,8 @@ loop do if changed_file files[changed_file] = File.mtime(changed_file) - puts "=> #{changed_file} changed, running #{command}" + puts "=> #{changed_file} changed" + puts "=> #{command}" system(command) puts "=> done" end dotless/bin/chelu/rstakeout.rb @@ -1,2 +1 @@ -#!/usr/bin/bash -history|awk '{print $2}'|sort|uniq -c|sort -rn|head +history|awk '{print $2}'|sort|uniq -c|sort -rn|head -n 30 dotless/bin/chelu/topcommands @@ -1,9 +1,9 @@ --- +:bulk_threshold: 1000 :benchmark: false -:update_sources: true -:verbose: true :sources: - http://gems.rubyforge.org -- http://gems.github.com/ +- http://gems.github.com +:verbose: true +:update_sources: true :backtrace: false -:bulk_threshold: 1000 dotted/gemrc @@ -8,9 +8,10 @@ st = status br = branch diffc = diff --cached + put = push origin HEAD [apply] - whitespace = strip + whitespace = nowarn [diff] color = auto @@ -27,3 +28,11 @@ [merge] summary = true + +# also need this line in .gitattributes: +# *.rb diff=ruby +[diff "ruby"] + funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\) +[github] + user = evilchelu + token = bc4bf8b50e934755d353100d920065e7 dotted/gitconfig @@ -1,12 +1,12 @@ # only for dirs and files set completion-ignore-case On -"\e[3~": delete-char +#"\e[3~": delete-char # ctrl + arrows # not worky :/ -"\e[5C": forward-word -"\e[5D": backward-word +#"\e[5C": forward-word +#"\e[5D": backward-word #"\e\e[C": forward-word #"\e\e[D": backward-word #"\e[1;5C": forward-word @@ -19,8 +19,9 @@ set completion-ignore-case On "\e[A": history-search-backward # ? -"\e[1~": beginning-of-line -"\e[4~": end-of-line -"\e[5~": beginning-of-history -"\e[6~": end-of-history -"\e[2~": quoted-insert +#"\e[1~": beginning-of-line +#"\e[4~": end-of-line +#"\e[5~": beginning-of-history +#"\e[6~": end-of-history +#"\e[2~": quoted-insert +"\ed": backward-kill-word dotted/inputrc @@ -84,8 +84,8 @@ permission_mode=0 filetype_mode=1 [Dirs] -other_dir=/Users/Shared -current_is_left=1 +other_dir=/Users/chelu/work/projects/wurbe/config +current_is_left=0 [New Left Panel] display=listing dotted/mc/ini @@ -1,14 +1,28 @@ -export PATH=/opt/local/bin:/opt/local/sbin:/usr/local/bin:$PATH +#export BRAID_USE_LOCAL_CACHE=yes + export PATH=/usr/local/mysql/bin:$PATH -export PATH=~/work/gems/giston/bin:$PATH +export PATH=/opt/local/bin:/opt/local/sbin:/usr/local/bin:$PATH + export PATH=~/work/gems/braid/bin:$PATH export PATH=~/work/sdk/air/bin:$PATH export PATH=~/.gems/bin:$PATH export PATH=~/bin:$PATH +export PATH=~/bin/chelu/ws:$PATH export PATH=~/bin/chelu:$PATH export PATH=~/src/s3sync:$PATH +export PATH=~/work/checkouts/one_inch_punch/bin:$PATH +export PATH=~/work/projects/braid/bin:$PATH +export PATH=~/dotfiles:$PATH + +export CLASSPATH="/Users/chelu/classpath:/Users/chelu/classpath/js.jar:$CLASSPATH" + export MANPATH=~/man:$MANPATH +export SUDOLESS=true +export MERB_SUDO= + +# in case git colors fuck up +#export LESS="-erX" . ~/bin/aliases @@ -34,6 +48,57 @@ export PERL5LIB=/usr/local/svn/perl:/usr/local/svn/perl/darwin-thread-multi-2lev complete -C ~/.bash_completion.d/rake-complete.rb -o default rake source ~/.bash_completion.d/git-completion.bash -# prompt -PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ ' +function git_current_branch { + git branch 2>/dev/null | awk '/^\* /{print $2 }' +} +function git_dirty { + git st 2> /dev/null | grep -c : | awk '{if ($1 > 0) print "*"}' +} +function git_formatted_current_branch_with_dirty { + if [ -n "$(git_current_branch)" ]; then + echo " ($(git_current_branch)$(git_dirty))" + fi + #awk '{if ($(git_current_branch)) print " (" $(git_current_branch)$(git_dirty) ")"}' +} +function dollar_or_pound { + if [ $(whoami) == "root" ]; then + echo "#" + else + echo "$" + fi +} +# bleh, el ugly :/ +function git_status { + if [ -n "$(git status 2>/dev/null)" ]; then + #echo "$(git status 2>/dev/null)" + echo "[" + else + echo "[" + fi +} +export PS1="\$(git_status)\u@\h \w\$(git_formatted_current_branch_with_dirty)]\$(dollar_or_pound) " + +#export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~} `git-branch 2>&1 | grep "*" | awk -F" " "{print $2}"`"; echo -ne "\007"' +#Update +#If you have git bash_completion installed, you can modify your PROMPT_COMMAND to this: +#export PROMPT_COMMAND='echo -ne "\033]0;${PWD/#$HOME/~} $(__git_ps1 " (%s)")"; echo -ne "\007"' + + +# TODO move these to some other file +gemdoc() { + local gemdir=`gem env gemdir` + open $gemdir/doc/`ls $gemdir/doc/ | grep $1 | sort | tail -1`/rdoc/index.html +} +gemcd() { + local gemdir=`gem env gemdir` + cd $gemdir/gems/$1 +} + +_gemsomplete() { + COMPREPLY=($(compgen -W '$(ls `gem env gemdir`/doc)' -- ${COMP_WORDS[COMP_CWORD]})) + return 0 +} + +complete -o default -o nospace -F _gemsomplete gemdoc +complete -o default -o nospace -F _gemsomplete gemcd dotted/profile @@ -1,3 +1,28 @@ +'Tlist_Auto_Highlight_Tag' taglist.txt /*'Tlist_Auto_Highlight_Tag'* +'Tlist_Auto_Open' taglist.txt /*'Tlist_Auto_Open'* +'Tlist_Auto_Update' taglist.txt /*'Tlist_Auto_Update'* +'Tlist_Close_On_Select' taglist.txt /*'Tlist_Close_On_Select'* +'Tlist_Compact_Format' taglist.txt /*'Tlist_Compact_Format'* +'Tlist_Ctags_Cmd' taglist.txt /*'Tlist_Ctags_Cmd'* +'Tlist_Display_Prototype' taglist.txt /*'Tlist_Display_Prototype'* +'Tlist_Display_Tag_Scope' taglist.txt /*'Tlist_Display_Tag_Scope'* +'Tlist_Enable_Fold_Column' taglist.txt /*'Tlist_Enable_Fold_Column'* +'Tlist_Exit_OnlyWindow' taglist.txt /*'Tlist_Exit_OnlyWindow'* +'Tlist_File_Fold_Auto_Close' taglist.txt /*'Tlist_File_Fold_Auto_Close'* +'Tlist_GainFocus_On_ToggleOpen' taglist.txt /*'Tlist_GainFocus_On_ToggleOpen'* +'Tlist_Highlight_Tag_On_BufEnter' taglist.txt /*'Tlist_Highlight_Tag_On_BufEnter'* +'Tlist_Inc_Winwidth' taglist.txt /*'Tlist_Inc_Winwidth'* +'Tlist_Max_Submenu_Items' taglist.txt /*'Tlist_Max_Submenu_Items'* +'Tlist_Max_Tag_Length' taglist.txt /*'Tlist_Max_Tag_Length'* +'Tlist_Process_File_Always' taglist.txt /*'Tlist_Process_File_Always'* +'Tlist_Show_Menu' taglist.txt /*'Tlist_Show_Menu'* +'Tlist_Show_One_File' taglist.txt /*'Tlist_Show_One_File'* +'Tlist_Sort_Type' taglist.txt /*'Tlist_Sort_Type'* +'Tlist_Use_Horiz_Window' taglist.txt /*'Tlist_Use_Horiz_Window'* +'Tlist_Use_Right_Window' taglist.txt /*'Tlist_Use_Right_Window'* +'Tlist_Use_SingleClick' taglist.txt /*'Tlist_Use_SingleClick'* +'Tlist_WinHeight' taglist.txt /*'Tlist_WinHeight'* +'Tlist_WinWidth' taglist.txt /*'Tlist_WinWidth'* :LUBufs lookupfile.txt /*:LUBufs* :LUPath lookupfile.txt /*:LUPath* :LUTags lookupfile.txt /*:LUTags* @@ -5,6 +30,22 @@ :LookupFile lookupfile.txt /*:LookupFile* :NERDTree NERD_tree.txt /*:NERDTree* :NERDTreeToggle NERD_tree.txt /*:NERDTreeToggle* +:TlistAddFiles taglist.txt /*:TlistAddFiles* +:TlistAddFilesRecursive taglist.txt /*:TlistAddFilesRecursive* +:TlistClose taglist.txt /*:TlistClose* +:TlistDebug taglist.txt /*:TlistDebug* +:TlistHighlightTag taglist.txt /*:TlistHighlightTag* +:TlistLock taglist.txt /*:TlistLock* +:TlistMessages taglist.txt /*:TlistMessages* +:TlistOpen taglist.txt /*:TlistOpen* +:TlistSessionLoad taglist.txt /*:TlistSessionLoad* +:TlistSessionSave taglist.txt /*:TlistSessionSave* +:TlistShowPrototype taglist.txt /*:TlistShowPrototype* +:TlistShowTag taglist.txt /*:TlistShowTag* +:TlistToggle taglist.txt /*:TlistToggle* +:TlistUndebug taglist.txt /*:TlistUndebug* +:TlistUnlock taglist.txt /*:TlistUnlock* +:TlistUpdate taglist.txt /*:TlistUpdate* LookupFile-command lookupfile.txt /*LookupFile-command* LookupFile_AllowNewFiles lookupfile.txt /*LookupFile_AllowNewFiles* LookupFile_AlwaysAcceptFirst lookupfile.txt /*LookupFile_AlwaysAcceptFirst* @@ -90,6 +131,10 @@ NERDTreeTodo NERD_tree.txt /*NERDTreeTodo* NERDTreeWinPos NERD_tree.txt /*NERDTreeWinPos* NERDTreeWinSize NERD_tree.txt /*NERDTreeWinSize* NERD_tree.txt NERD_tree.txt /*NERD_tree.txt* +Tlist_Get_Tag_Prototype_By_Line() taglist.txt /*Tlist_Get_Tag_Prototype_By_Line()* +Tlist_Get_Tagname_By_Line() taglist.txt /*Tlist_Get_Tagname_By_Line()* +Tlist_Set_App() taglist.txt /*Tlist_Set_App()* +Tlist_Update_File_Tags() taglist.txt /*Tlist_Update_File_Tags()* basic-snippet snippets_emu.txt /*basic-snippet* config/rails.vim rails.txt /*config\/rails.vim* ds surround.txt /*ds* @@ -336,9 +381,25 @@ surround-mappings surround.txt /*surround-mappings* surround-replacements surround.txt /*surround-replacements* surround-targets surround.txt /*surround-targets* surround.txt surround.txt /*surround.txt* +taglist-commands taglist.txt /*taglist-commands* +taglist-debug taglist.txt /*taglist-debug* +taglist-extend taglist.txt /*taglist-extend* +taglist-faq taglist.txt /*taglist-faq* +taglist-functions taglist.txt /*taglist-functions* +taglist-install taglist.txt /*taglist-install* +taglist-internet taglist.txt /*taglist-internet* +taglist-intro taglist.txt /*taglist-intro* +taglist-keys taglist.txt /*taglist-keys* +taglist-license taglist.txt /*taglist-license* +taglist-menu taglist.txt /*taglist-menu* +taglist-options taglist.txt /*taglist-options* +taglist-requirements taglist.txt /*taglist-requirements* +taglist-session taglist.txt /*taglist-session* +taglist-todo taglist.txt /*taglist-todo* +taglist-using taglist.txt /*taglist-using* +taglist.txt taglist.txt /*taglist.txt* vs surround.txt /*vs* xml-plugin-callbacks xml-plugin.txt /*xml-plugin-callbacks* -xml-plugin-callbacks xml-plugin.txt /*xml-plugin-callbacks* xml-plugin-html xml-plugin.txt /*xml-plugin-html* xml-plugin-mappings xml-plugin.txt /*xml-plugin-mappings* xml-plugin-settings xml-plugin.txt /*xml-plugin-settings* dotted/vim/doc/tags @@ -292,9 +292,6 @@ for details. ------------------------------------------------------------------------------ *xml-plugin-callbacks* ------------------------------------------------------------------------------- - *xml-plugin-callbacks* - Callback Functions {{{2 ~ A callback function is a function used to customize features on a per tag dotted/vim/doc/xml-plugin.txt @@ -34,7 +34,7 @@ call add(g:SIZES, { "columns": 114, "columnsfs": 115, "lines":28, "linesfs": 29, function! GuiSizeSet(size) if eval(&fullscreen) - exec "set columns=" . g:SIZES[a:size].columnsfs . " lines=" . g:SIZES[a:size].linesfs + "exec "set columns=" . g:SIZES[a:size].columnsfs . " lines=" . g:SIZES[a:size].linesfs else exec "set columns=" . g:SIZES[a:size].columns . " lines=" . g:SIZES[a:size].lines end @@ -442,6 +442,7 @@ function! KeyMapExec(mode, modifier, key, action) endif " \o/\O/\o/ + "echo s:map execute s:map endfunction @@ -665,3 +666,20 @@ ruby << EOF =end EOF endfunction + +function! VampRegisterToMap_(register) + let keycodes = { 'ku': {'name': 'Up', 'meaning': 'arrow up'}, 'kd': {'name': 'Down', 'meaning': 'arrow down'}, 'kr': {'name': 'Right', 'meaning': 'arrow right'}, 'kl': {'name': 'Left', 'meaning': 'arrow left'}, '%i': {'name': 'S-Right', 'meaning': 'shift arrow right'}, '#4': {'name': 'S-Left', 'meaning': 'shift arrow left'}, 'k1': {'name': 'F1', 'meaning': 'function key 1'}, 'k2': {'name': 'F2', 'meaning': 'function key 2'}, 'k3': {'name': 'F3', 'meaning': 'function key 3'}, 'k4': {'name': 'F4', 'meaning': 'function key 4'}, 'k5': {'name': 'F5', 'meaning': 'function key 5'}, 'k6': {'name': 'F6', 'meaning': 'function key 6'}, 'k7': {'name': 'F7', 'meaning': 'function key 7'}, 'k8': {'name': 'F8', 'meaning': 'function key 8'}, 'k9': {'name': 'F9', 'meaning': 'function key 9'}, 'k;': {'name': 'F10', 'meaning': 'function key 10'}, 'F1': {'name': 'F11', 'meaning': 'function key 11'}, 'F2': {'name': 'F12', 'meaning': 'function key 12'}, 'F3': {'name': 'F13', 'meaning': 'function key 13'}, 'F4': {'name': 'F14', 'meaning': 'function key 14'}, 'F5': {'name': 'F15', 'meaning': 'function key 15'}, 'F6': {'name': 'F16', 'meaning': 'function key 16'}, 'F7': {'name': 'F17', 'meaning': 'function key 17'}, 'F8': {'name': 'F18', 'meaning': 'function key 18'}, 'F9': {'name': 'F19', 'meaning': 'function key 19'}, '%1': {'name': 'Help', 'meaning': 'help key'}, '&8': {'name': 'Undo', 'meaning': 'undo key'}, 'kI': {'name': 'Insert', 'meaning': 'insert key'}, 'kD': {'name': 'Del', 'meaning': 'delete key'}, 'kb': {'name': 'BS', 'meaning': 'backspace key'}, 'kB': {'name': 'S-Tab', 'meaning': 'back-tab (shift-tab)'}, 'kh': {'name': 'Home', 'meaning': 'home key'}, '#2': {'name': 'S-Home', 'meaning': 'shifted home key'}, '@7': {'name': 'End', 'meaning': 'end key'}, '*7': {'name': 'S-End', 'meaning': 'shifted end key'}, 'kP': {'name': 'PageUp', 'meaning': 'page-up key'}, 'kN': {'name': 'PageDown', 'meaning': 'page-down key'}, 'K1': {'name': 'kHome', 'meaning': 'keypad home key'}, 'K4': {'name': 'kEnd', 'meaning': 'keypad end key'}, 'K3': {'name': 'kPageUp', 'meaning': 'keypad page-up key'}, 'K5': {'name': 'kPageDown', 'meaning': 'keypad page-down key'}, 'K6': {'name': 'kPlus', 'meaning': 'keypad plus key'}, 'K7': {'name': 'kMinus', 'meaning': 'keypad minus key'}, 'K8': {'name': 'kDivide', 'meaning': 'keypad divide'}, 'K9': {'name': 'kMultiply', 'meaning': 'keypad multiply'}, 'KA': {'name': 'kEnter', 'meaning': 'keypad enter key'}, 'KB': {'name': 'kPoint', 'meaning': 'keypad decimal point'}, 'KC': {'name': 'k0', 'meaning': 'keypad 0'}, 'KD': {'name': 'k1', 'meaning': 'keypad 1'}, 'KE': {'name': 'k2', 'meaning': 'keypad 2'}, 'KF': {'name': 'k3', 'meaning': 'keypad 3'}, 'KG': {'name': 'k4', 'meaning': 'keypad 4'}, 'KH': {'name': 'k5', 'meaning': 'keypad 5'}, 'KI': {'name': 'k6', 'meaning': 'keypad 6'}, 'KJ': {'name': 'k7', 'meaning': 'keypad 7'}, 'KK': {'name': 'k8', 'meaning': 'keypad 8'}, 'KL': {'name': 'k9', 'meaning': 'keypad 9'} } + + let s = strtrans(eval("@" . a:register)) + for [code, details] in items(keycodes) + " fuckin substitute()! + " it eats the next char after the <80> + " so i'm hacking it using strtrans + "let s = substitute(s, "\\%x80" . key, "<" . value . ">", "g") + "let s = substitute(s, "<80>" . code, "(" . details['meaning'] . ") ", "g") + let s = substitute(s, "<80>" . code, "<" . details['name'] . ">", "g") + endfor + echo s +endfunction +command! -nargs=1 VampRegisterToMap :call VampRegisterToMap_(<args>) + dotted/vim/evil.che.lu.vim @@ -86,9 +86,10 @@ set showmode " show mode in status when not in normal mode set virtualedit=block set noerrorbells set visualbell " must turn visual bell on to remove audio bell -set t_vb= " turn bells of, must also set this in .gvimrc +set t_vb= " turn bells off, must also set this in .gvimrc set wildmenu " nice menu when completing commands set wildmode=list:longest,full +set fuoptions=maxvert,maxhorz if has("win32") set guifont=DejaVu_Sans_Mono:h10 @@ -137,12 +138,13 @@ call CHELU_spaces() """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """""""""" taglist settings """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"let Tlist_Ctags_Cmd = "/usr/bin/ctags" -"let Tlist_Compact_Format = 1 -"let Tlist_File_Fold_Auto_Close = 1 -"let Tlist_Use_Right_Window = 1 -"let Tlist_Exit_OnlyWindow = 1 -"let Tlist_WinWidth = 40 +runtime taglist.vim +let Tlist_Ctags_Cmd = "/opt/local/bin/ctags" +let Tlist_Compact_Format = 1 +let Tlist_File_Fold_Auto_Close = 1 +let Tlist_Use_Right_Window = 1 +let Tlist_Exit_OnlyWindow = 1 +let Tlist_WinWidth = 40 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """""""""" MiniBufExplorer / tabbar @@ -161,6 +163,13 @@ let NERDTreeChDirMode = 0 " don't change dirs let NERDTreeWinSize = 60 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +"""""""""" NERDCommenter settings +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +let g:NERDMapleader='<space>' +let g:NERDRemoveExtraSpaces=1 +let g:NERDSpaceDelims=1 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """""""""" TOhtml """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" let use_xhtml = 1 @@ -233,18 +242,18 @@ let g:template{'vim'}{'fun'} = "function! ()\<CR>endfunction\<Up>\<End>\<Left>\< " rails - erb let g:template{'_'}{'rr'} = "<% -%>\<Left>\<Left>\<Left>\<Left>" -let g:template{'_'}{'re'} = "<%= -%>\<Left>\<Left>\<Left>\<Left>" +let g:template{'_'}{'ree'} = "<%= -%>\<Left>\<Left>\<Left>\<Left>" let g:template{'_'}{'rrr'} = "<% %>\<Left>\<Left>\<Left>" let g:template{'_'}{'rre'} = "<%= %>\<Left>\<Left>\<Left>" let g:template{'_'}{'cc'} = "/* */\<Left>\<Left>\<Left>" let g:template{'_'}{'hh'} = "<!-- -->\<Left>\<Left>\<Left>\<Left>" let g:template{'_'}{'le'} = "{{ }}\<Left>\<Left>\<Left>" -let g:template{'_'}{'ll'} = "{% %}\<Left>\<Left>\<Left>" +let g:template{'_'}{'lll'} = "{% %}\<Left>\<Left>\<Left>" " rails rspec let g:template{'ruby'}{'rde'} = "describe \"\" do\n \n\<BS>end\n\<Up>\<Up>\<Up>" . repeat("\<RIGHT>", 10) let g:template{'ruby'}{'rit'} = "it \"should \" do\n \n\<BS>end\n\<BS>\<Up>\<Up>\<Up>" . repeat("\<RIGHT>", 13) -let g:template{'ruby'}{'rbe'} = "before(:each) do\n \n\<BS>end\n\<Up>\<Up>" . repeat("\<RIGHT>", 2) +let g:template{'ruby'}{'rbe'} = "before do\n \n\<BS>end\n\<Up>\<Up>" . repeat("\<RIGHT>", 2) let g:template{'ruby'}{'rbea'} = "before do\n \n\<BS>end\n\<Up>\<Up>" . repeat("\<RIGHT>", 2) let g:template{'ruby'}{'rhe'} = "module SpecHelper\<CR> def valid_attributes\<CR> {\<CR> : => '',\<CR>\<BS>}\<CR>\<BS>end\<CR>\<BS>end\<CR>" . repeat("\<UP>", 7) . repeat("\<RIGHT>", 7) @@ -276,7 +285,7 @@ let g:template{'css'}{'vm'} = "vertical-align: middle;" let g:template{'sass'}{'fl'} = "float: left\<CR>display: inline\<CR>" let g:template{'sass'}{'fr'} = "float: right\<CR>display: inline\<CR>" let g:template{'sass'}{'bg'} = "background: url(../images/.gif) left top no-repeat" . repeat("\<Left>", 24) -let g:template{'sass'}{'bgi'} = "background: url(../images/.gif)" . repeat("\<Left>", 5) +let g:template{'sass'}{'bgi'} = "background-image: url(../images/.gif)" . repeat("\<Left>", 5) let g:template{'sass'}{'bgc'} = "background-color: #" let g:template{'sass'}{'bn'} = "background: none" let g:template{'sass'}{'bo'} = "border: solid 1px #" @@ -455,7 +464,7 @@ inoremap <S-CR> <C-o>o inoremap <D-CR> <C-o>O """""""""" tools -call KeyMap('ni', 'L', 'f', ':let @+ = expand("%:p")<CR>') " copy current filename in clipboard +"call KeyMap('ni', 'L', 'f', ':let @+ = expand("%:p")<CR>') " copy current filename in clipboard " TODO " move these to a function call KeyMap('ni', 'L', 'e', ':call BrowserFromCurrentDir()<CR>') " open a file browser in a new tab @@ -463,15 +472,10 @@ call KeyMap('ni', 'L', 'E', ':call BrowserFromCurrentFilePath()<CR>') " "call KeyMap('ni', 'L', 'x', ':ExtractFileToTabpage()<CR>') " extract current file to a new buffer -call KeyMap('n', 'L', 'r', ':%s/\n\n/\r/<CR>') -call KeyMap('v', 'L', 'r', ':s/\n\n/\r/<CR>') -call KeyMap('n', 'L', 'R', ':%s/\s\s*$//<CR>') -call KeyMap('v', 'L', 'R', ':s/\s\s*//<CR>') - -call KeyMap('n', 'L', 'c', ':%s/^/#/<CR>') -call KeyMap('v', 'L', 'c', ':s/^/#/<CR>') -call KeyMap('n', 'L', 'C', ':%s/^\s*#//<CR>') -call KeyMap('v', 'L', 'C', ':s/^\s*#//<CR>') +" call KeyMap('n', 'L', 'r', ':%s/\n\n/\r/<CR>') +" call KeyMap('v', 'L', 'r', ':s/\n\n/\r/<CR>') +" call KeyMap('n', 'L', 'R', ':%s/\s\s*$//<CR>') +" call KeyMap('v', 'L', 'R', ':s/\s\s*//<CR>') if has("macunix") call KeyMap('n', 'DLM', 'k', ':call GuiSizeNext()<CR>') @@ -482,8 +486,23 @@ endif call KeyMap('ni', 'L', 'q', ':exec "NERDTreeToggle " . getcwd()<CR>') " Toggle NERDTree call KeyMap('ni', 'L', 'Q', ':exec "NERDTreeToggle " . GetCwdCurrent()<CR>') " Toggle NERDTree call KeyMap('n', 'L', '`', ':NERDTreeToggle<CR>') +call KeyMap('n', 'L', 'x', 'xx\<down>x\<up>\<up>p\<up>udw$d6hx') "call KeyMap('i', 'DLM', '/', '*/') map <leader>hl :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR> +"nmap <silent> <leader> <Plug>DiffChangesDiffToggle +"nmap <silent> cac xx<down>x<up><up>p<up>udw$d6hx + +function! XXX() + let f = expand("%:p") + let f = substitute(f, "newlyn", "newlynhtml", "") + let f = substitute(f, "html.haml", "rhtml", "") + tabnew + exec "e " . f +endfunction +call KeyMap('ni', 'L', 'f', ':call XXX()<CR>') " Toggle NERDTree +call KeyMap('ni', 'CDLM', 'p', ':TlistToggle<CR>') + + dotted/vimrc install.rb 3823d459431eec07aaa023e8a2b21b1280449d14 Cristi Balan evil@che.lu http://github.com/evilchelu/dotfiles/commit/5ae30df525ff2c820bc3693bc92a0fe2811e39e5 5ae30df525ff2c820bc3693bc92a0fe2811e39e5 2008-10-26T10:57:16-07:00 2008-10-26T10:57:16-07:00 big update. i should really use this fa897450e52288e9cf7d6951be22b623b6845105 Cristi Balan evil@che.lu