From a0995d6be54235da577da534bdf9773c333a7b72 Mon Sep 17 00:00:00 2001 From: michener Date: Wed, 9 Sep 2009 07:03:29 +0000 Subject: [PATCH] Merge git-svn-id: http://photonzero.com/dotfiles/trunk@32 23f722f6-122a-0410-8cef-c75bd312dd78 --- .bash_aliases | 1 + .bash_profile | 2 +- .hgrc | 2 ++ .screenrc | 2 +- .vim/filetype.vim | 5 ++++- .zprofile | 15 ++++++++++++++- .zsh_profile | 2 +- .zshrc | 28 ++++++++++++++-------------- bin/contract | 2 +- bin/gettermsize | Bin 11699 -> 6889 bytes bin/shakegrep | 2 +- 11 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 .hgrc diff --git a/.bash_aliases b/.bash_aliases index 9bcedcf..2945d08 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -45,6 +45,7 @@ alias la='ls -alF' alias vi='vim' alias grep="grep --color=auto" alias screen="screen -R" +alias dvtm="dvtm -m \"^w\"" #Cosmetic/useful #alias naim="naim --noscreen" diff --git a/.bash_profile b/.bash_profile index e0ee3c9..72ac479 100644 --- a/.bash_profile +++ b/.bash_profile @@ -6,7 +6,7 @@ # # remove /usr/games and /usr/X11R6/bin if you want -PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin; export PATH +PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin; export PATH case `uname` in SunOS) UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH diff --git a/.hgrc b/.hgrc new file mode 100644 index 0000000..01da7e3 --- /dev/null +++ b/.hgrc @@ -0,0 +1,2 @@ +[ui] +username = Barak Michener diff --git a/.screenrc b/.screenrc index 6daca1d..68b2ceb 100644 --- a/.screenrc +++ b/.screenrc @@ -79,7 +79,7 @@ bindkey "\033[15~" select 5 # make keypad_delete send ascii 127. this is wrong: really I ought # to fix all the termcaps that have kD=\177 instead of kD=\E[3~, but # this works and I don't care that much. -bindkey -k kD stuff \177 +#bindkey -k kD stuff \177 # by default, always let me know when background windows produce text #defmonitor on diff --git a/.vim/filetype.vim b/.vim/filetype.vim index 1786fcf..98bf765 100644 --- a/.vim/filetype.vim +++ b/.vim/filetype.vim @@ -6,7 +6,10 @@ augroup markdown au! BufRead,BufNewFile *.mkd setfiletype mkd augroup END augroup mako - au! BufRead,BufNewFile *.mak setfiletype mako + au! BufRead,BufNewFile *.mak,*.mako setfiletype mako +augroup END +augroup csv + au! BufNewFile,BufRead *.csv setf csv augroup END augroup python autocmd FileType python set omnifunc=pythoncomplete#Complete diff --git a/.zprofile b/.zprofile index 8d4cb15..0e8046a 100644 --- a/.zprofile +++ b/.zprofile @@ -6,7 +6,20 @@ # # remove /usr/games and /usr/X11R6/bin if you want -PATH=$HOME/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin; export PATH +PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin; export PATH +case `uname` in +SunOS) + UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH + PATH=$PATH:$UCB_PATH; export PATH + ;; +Darwin) + MACPORTS_PATH=/opt/local/bin:/opt/local/sbin:/opt/local/usr/bin:/opt/local/usr/local/bin; export MACPORTS_PATH + PATH=$HOME/bin:$MACPORTS_PATH:$PATH; export PATH + export DISPLAY=:0.0 + set completion-ignore-case on + ;; +esac +#PATH=$HOME/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin; export PATH # Setting TERM is normally done through /etc/ttys. Do only override # if you're sure that you'll never log in via telnet or xterm or a diff --git a/.zsh_profile b/.zsh_profile index 76b8e48..c6b4125 100644 --- a/.zsh_profile +++ b/.zsh_profile @@ -6,7 +6,7 @@ # # remove /usr/games and /usr/X11R6/bin if you want -PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin; export PATH +PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:$HOME/.gem/ruby/1.9/bin; export PATH case `uname` in SunOS) UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH diff --git a/.zshrc b/.zshrc index 207f164..6389698 100644 --- a/.zshrc +++ b/.zshrc @@ -25,21 +25,21 @@ ZLS_COLORS=$LS_COLORS ### # Decide whether to set a screen title - if [[ "$TERM" == "screen" ]]; then - PR_STITLE=$'%{\ekzsh\e\\%}' - else - PR_STITLE='' - fi +# if [[ "$TERM" == "screen" ]]; then +# PR_STITLE=$'%{\ekzsh\e\\%}' +# else +# PR_STITLE='' +# fi - preexec () { - local CMD="${1/#sudo /#}" - local CMD="${CMD/#nano /}" - local CMD="${CMD/#ssh />}" - $SCREENME true || echo -ne "\ek${CMD%% *}\e\\" - } - precmd () { - $SCREENME true || echo -ne "\ekzsh\e\\" - } +# preexec () { +# local CMD="${1/#sudo /#}" +# local CMD="${CMD/#nano /}" +# local CMD="${CMD/#ssh />}" +# $SCREENME true || echo -ne "\ek${CMD%% *}\e\\" +# } + #precmd () { + #$SCREENME true || echo -ne "\ekzsh\e\\" + #} PROMPT='$PR_STITLE$PR_LIGHT_BLUE($PR_LIGHT_YELLOW%D{%H:%M}|%!$PR_BLUE%)[%(!.$PR_RED.$PR_GREEN)%n@%m$PR_LIGHT_CYAN %~$PR_BLUE]$PR_NO_COLOUR%(!.#.$) ' #source .zshprompt diff --git a/bin/contract b/bin/contract index dcbad82..bc88275 100755 --- a/bin/contract +++ b/bin/contract @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/local/bin/python import sys diff --git a/bin/gettermsize b/bin/gettermsize index 474eee36ea9341337d358a6730b19593c1efc4bc..fdd6482f458173d9373ba2108e79ca64fc0bf2b6 100755 GIT binary patch literal 6889 zcmcgwdu&^075{AK;dX7}tZOM0X;-X~GHtoG)1+~uu5+44Z?>$B@(`c_w|?9t20wy* zQzfOM6JATBw2}u*Ok#gTlcxQFG(|$t2_fpPXe*#e)r8=WA`wJ461t)A5cD5r&iU>+ z_PsZbI)vaP*XKLG?>xTu>-^B@u-D_+A&9)sN@E9*`no5z#E7;(*vM zngD5pFDi48TPfz3&>0YOzaD=gPQWUGi*$zcCx!G*x-)y$*n4hMCG3WYW-SAtZ{57f{^Zk}P zXhDlm7isK0Gl}UtRL(n1QG`LZIQwVLcENNiZY&syU^>}pq^H$FP7R|S>Y)x6V>oXZ z$0r8GcVFKr+kYou*zu_2Y*S00`-t0sngF!7r-vcyLHNGV5OpX$NqCxYZsx}UZxj2( zOFOJ~<$85XycPP(iMNxVbL8h0kddB-593}YJcu9=S_i~mDl6n)g77l}AL_sC(#LjE z;M+p_Q)l#XV45Rwx(+0d1bZmhKg)T*6F?xqK>XP75P@CY8@+g|5%#b2Hgk z#t?ccn=*AXT@W$TSV);dH?m1F485U;)er>p!k-8JEY7Wi{os*vAV39L?KlhF;1yFO z&r-dxZ)m8=oH-j_^CrZC4Y&9Cb2hw*d?UML!?|w|*NPwb*H1yj^~y}dq$8IQrw-Ctu>tAy?H+!H-e9AO6T9xQ3avLC{|2;nO4 zLJ=-w5tai`%K1BQHSPvIk8Hf@>FE-FTJech9~$p_1FMTg+I3BXP8eCb(O>yP>2Eix zp=4r8TY3*-2DB?vn?Id3{n2Y^CT-WxeN?HmULD$Oy?P7SUt6zkUMoSRtjzO}DN{dp zc!VOhLHr4=c&}pa4d1TZ(w2(~#Mg><{Rqx~_$(U8{%?i)TU~#U)|Nh{kcTxW6%Qr~ z^TAjqdAK{6$eSs3;_)*|SnXB1LZR+p=uogLtc1dShmQ1x!pfWhb4nRnm{Sgl_N20) zv?q6p`*_Tf$HVva2=n4VrJ~S2FboY~rznl@hY0kX9T%R3fXBD1*hC2;_^%s8J5SY{rle#jI52JvqZe}(uq<35qgWO7-YO7VOw zn^Y5WI(4gEAvKIMpf?!q3Wg3V;X{4h_^*5=6{i_>pNSMEU*R6~(-RDbf+3iuU47sx z+^fWs2KhNLFwm!ToH#l4r~+{*Y^XPUL{Xll+5bf${{LEPVKHOI;zBK$d5h0-3U*^7 zKPS{|&NS5i<0GABY(}WFvBIoSlZ#m}w78iU>P&WCJ!9kxDcHE}f)06kBOO!c(xy;x z8y6~U;qW^R0_5eAF*7DqV^*Ke!&a})Cc(mq$tbZ*Dk0Q_nadYIw%C^w7&!;d;srpl zmyN8+W9Gl%2f!HT3eP(}SMzz>JzsfVam+^`fpe4X`P{ljiahUGpVt$X@$iXj3fuEK zbC2wC%|v25K3lNd3wgN4usyFs5dt>R7zksaOSb27;dv7e5^T@wS_gtaypCB?ZT)2V z1SDXN=h&XtnTur4>lc@o^_WkBJ+5Ia^E$Rd_6h}Zm!DvffCTzx`?4=8v&v-8>nQ5r z+U%}>1~6=wCisweABa$a_gHZCm+Qd*p4#m8qqIJalHzGrB+mA7^8>5^pWUACldGh7 z2{UcPb_^{-!fubJF{B7ps6|S(ACAw+c}So=w;%8O!({(5D-w4VM|{&|&-X9BmvMWu z8+ZH{$)38adXM4zCy!IMcl-OEE50Ajr$~OC@3E(;!Z`kr z*q;00b-+-C?K@~6@1U0g)eT3{IAJhIPE_*xzBWYysj^~!IyX^TK zGDh}MbY>&AXZ{xCVVdh-qWGncS^i&wEj6(%3Y-VYKJ3bLiEt;b#kM=RP6x4H*+EFV z?NR2jZ&&>sUV4E_G!H%n>2CPA-aIa`m|S;AR%x9SJTB+%_*H{C2_KY}_al3@4@$h| ziP|BV_CZN_|FCEJV1}3V@Oov>^of@0JCGBvy^}cc0IV0*ym8`f@SarO8HjY0Yjc)vtPJkqzz|rg^9G4C7{^LZg z@s6)8Jl;4`>o)qG+u(SPspo$?KX|UFr#}w32VSJy?SES0TiZV?@vZIuHNd@aa>Dzl zon8RJ1Mh6y{ybk-Bo3u@jfd9&M?ZLfwbORx{{bjr`9rS$ElYfl;CnXvdPm~$PUMPv zTjE>m^+&+5Jb3T5)4xEd*Pj1re{JXI05nuR|BnLR27m5()P=aWRorWGj`Jr0$EDZ( zE{acRh`ZlK6B6IL&ZN+Po%hnOO1!oX@Opku`l+oy@(lyx6(uf&`yKT=fa7~9j}uUp zv_gLH-2!P){tEG`#J8?v-zWd>_t+nA{#)|ze!u+?aD~d| zU~qMYtFDN}Q+Nps&KL5*?VhT{QM`!3HM=vN${NSS(fE8SZFZ)z#{_sOnDf)q;7Qj9 zCQps)qazcOx(?EyLwah!mX*xuGwEDBme%FHPmj$n2naEkhKH}D+7s#ui#cH7Bf`2u zCg(GmMGi1@a5r%uFl=59abpjql@j pEkjpN{^O%V(Cqk(Zat~nP3pYW{~LE8dhY-L literal 11699 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 diff --git a/bin/shakegrep b/bin/shakegrep index 0f4d15e..7d5f78d 100755 --- a/bin/shakegrep +++ b/bin/shakegrep @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #echo $2 #agrep -n -i -d '$$' -t -r "$*" ~/shakespeare | sed '/\/.*\/[A-Za-z]*:/ s/:\s*/:\n/' agrep -i -d '$$' -t -r "$1" /home/michener/shakespeare/**/*$2* | sed '/\/.*\/[A-Za-z0-9]*:/ s/:\s*/:\n/'