Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bankruptcy commit

  • Loading branch information...
commit 6aa60dbdcb9840b3670f72936eb3ce2b115b2140 1 parent b0c787a
@tpope authored
View
5 .Xresources
@@ -259,11 +259,6 @@ URxvt.perl-eval: push @{ $urxvt::TERM->{selection_popup_hook} }, \n\
sub { /./ ? ("string quote" => sub { s([\\\\\\042$@]|#[{])(\\\\$&)g; s{\\n}{\\\\n}g; s{\\t}{\\\\t}g; s{\\r}{\\\\r}g; s{[\\000-\\037]}{sprintf("%03o",ord($&))}eg; $_ = qq("$_"); }) : () }, \n\
sub { /\\n\\[?\\d\\d(\\d\\d-|:)\\d\\d/ ? ("quote for irc" => sub { s{^\\[?[\\d:_-]+\\]? +}{}; s/\\s*\\n\\[?[\\d:_-]{5,}\\]? +/ || /g; s/^\\s+/ /mg; s/( ?) \*\\n( ?)/($1||$2)/eg; s{ $}{}; }) : () };
URxvt.urlLauncher: sensible-browser
-!URxvt.matcher.pattern.1: ^\\B(/\\S+?):(\\d+)(?=:|$)
-!URxvt.matcher.launcher.1: gvim +$2 $1
-!URxvt.matcher.pattern.2: (?:https?:\/\/|ftp:\/\/|news:\/\/|mailto:|file:\/\/|\\bwww\\.)[a-zA-Z0-9\\-\\@;\\/:&=%\\$_.+*~]*\\.(?:gif|jpg|png)\\b
-!URxvt.matcher.launcher.2: feh -Z $0
-!URxvt.matcher.button: 1
URxvt.selection-pastebin.cmd: scp -p % tpope.us:/var/www/pastebin/
URxvt.selection-pastebin.url: http:\/\/tpope.us/pastebin/%
URxvt.remote-selection.store: ssh tpope.us 'cat >/tmp/distributed-selection'
View
3  .muttrc
@@ -68,6 +68,7 @@ ignore X-ML- X-MLServer X-Mail-Count Posted X-Complaints-To Complaints-To
ignore Newsgroups NNTP- X-From-Usenet X-Trace Injection-Info X-rubymirror
ignore Return-Path Message-ID Received Mime-Version Content-Disposition Path
ignore Content-Type Content-Length Status Lines "From "
+ignore X-Twitter X-Campaignid X-Forwarded-To X-Forwarded-For X-DKIM X-DomainKeys
# Section: Bindings {{{1
# ----------------------
@@ -219,7 +220,7 @@ lists mutt-users speedseductionlist zaurus-general debian-knoppix
# ------------------
`mutt -v|grep +USE_IMAP >/dev/null && echo set imap_list_subscribed=yes || echo set`
-account-hook . 'unset imap_user imap_pass tunnel'; folder-hook . 'set folder="$HOME/Mail" record="=sent"'
+account-hook . 'unset imap_user tunnel'; folder-hook . 'set folder="$HOME/Mail" record="=sent"'
account-hook imap://localhost/ 'set tunnel="/usr/sbin/imapd"'; folder-hook imap://localhost/ 'set folder=imap://localhost/'
account-hook imap://michael/ 'set tunnel="ssh -qax michael /usr/sbin/imapd"'; folder-hook imap://michael/ 'set folder=imap://michael/'
View
3  .screenrc
@@ -9,14 +9,15 @@ bindkey ^Q command
bindkey ^Z command
defnonblock on
defscrollback 1024
+defflow off
termcapinfo xterm*|rxvt*|kterm*|Eterm*|putty*|dtterm* WS=\E[8;%d;%dt
termcapinfo xterm*|rxvt*|kterm*|Eterm*|putty*|dtterm* ti@:te@:G0
termcapinfo xterm*|rxvt*|kterm*|Eterm*|putty*|dtterm* hs:ts=\E]2;:fs=\007:ds=\E]2;8)\007
termcapinfo xterm*|rxvt*|kterm*|Eterm*|putty*|dtterm* XT
termcapinfo Eterm*|linux* C8
+termcapinfo * "" Co#256
termcapinfo rxvt*|Eterm* "" *7=\E[8$:%i=\E[c:#4=\E[d:#2=\E[7$
termcapinfo xterm* "" *7=\E[2F:%i=\E[2C:#4=\E[2D:#2=\E[2H
-defflow off
windowlist string "%3n %{= dd}%?%h%:%t%?%=%f%{-}"
caption string "%?%F%{y}%?%3n %{= wk}%?%h%:%t%?%{-}"
activity "Activity in window %n (%t)^G^G"
View
13 .shrc
@@ -26,13 +26,8 @@ done
HASHROCKET_DIR="$HOME/src/hashrocket"
[ ! -r "$HASHROCKET_DIR/dotmatrix/.hashrc" ] || . "$HASHROCKET_DIR/dotmatrix/.hashrc"
-case "$PATH" in
- "$HOME"/bin:*) ;;
- *) PATH="$HOME/bin:$PATH" ;;
-esac
-
if [ -z "$LANG" -a -z "$LC_ALL" -a -f "$HOME/.locale" ]; then
- LANG="`cat "$HOME/.locale"`"
+ LANG=`cat "$HOME/.locale"`
export LANG
fi
@@ -77,8 +72,8 @@ export RSYNC_RSH CVS_RSH CVSROOT LYNX_CFG
ulim="ulimit -S -u"
$ulim >/dev/null 2>/dev/null || ulim="ulimit -S -p"
-unum=256
-[ -z "$CRON" ] || unum=128
+unum=512
+[ -z "$CRON" ] || unum=256
cunum="`$ulim 2>/dev/null`"
case "$cunum" in [0-9]*) ;; *) cunum=65535 ;; esac
[ "$unum" -ge "$cunum" ] || $ulim "$unum" 2>/dev/null
@@ -130,7 +125,7 @@ if [ "$interactive" -o "$_" = "interactive" ] || \
umask 002
fi
- PS1="$LOGNAME@$hostname `basename "$execbin"`$promptchar "
+ PS1="$LOGNAME@$hostname `basename $execbin`$promptchar "
#case `basename "$execbin"` in
#*ksh*)
View
1  .ssh/authorized_keys2
@@ -2,3 +2,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2xVDlzFdwyJl9lsSL1fH2Sn0QTFyC21EnKsu7WjIikoz
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA8ClzwVTL1hWZdpfGsZMht1yyBp/qh2ycAtLbfytgLMTq6i8pzWocFOTYzD0nbL6tABfJkNBAK0yniCXIpjDmSI8m6Nmm49/q0rX5DO2tv20ZI65SYQyj7X6+s1/9h4GOiqOEDKrDykHah2+yBKcm58fQBuUvw1YVoM4PVtBio9W2yAP5FZOWHz7ivJ9WQgz3FV8NFt4akqGCIS74+/nHtQ/ohFrs8F9PdzQk1BYip9ElBDOlCfv2HnAKsdfGgecaAKbytrFoZZpb1af2WQAt32CCVxkcz1CpLAkdlr4irREX09EhAcF7e9lJnamXMyVLhkJYYnXKEcKwzwkrXYBz6w== tpope@maeby
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2p19vFWrpltbs6lB5S3hGJVvnPzLd5eUpTxtvUgAfR37ONV/GqqYt2GsqeNvqmtmsclNSH3lggdt4nQOxkHRb63uAP8zPsIIEB437R3sgG3OBY1TB40AdpTivMQanJPPadIzCVxCNZx94J/0X3eCB7PHBPQ2wHTACdBZs4HLC2DgDA6rZTLCW6ZwH94ALTcYSCS4idz1/XfH47qZ6LdnxjgW9OVfD7JuM7esF8LCDkcX7rcexCiwM0BHu9gD7M0SOYVvA/UAwoh8UkpR9zm2TzOJIdjaWRRk0MbZtK4reBJQWbU+EuhzThTHQwh2YRl6SipQGJpkXV53unQiHZQbIQ== tpope@client
ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAlndsTE2rmKMPiayPDbqzA18MpykC00xzteoX/1ZSzv3jGXsUazbOLneJ+3g++UDPFA2euloODbak74m3kMOBF+IpCgKq9CgItZQdq/gtgZUPq4qhUoTJxgzd09UUBaokCK0RV9C2hfF1KnHCOYAAUVL+LMdAuQ8A46TVQDVg6OgwxRvFHOitAu8w3jYUjKSEiTDmTUdfJqdXrIvTb0Nf5A8SRDb//dQaZJjkfESHEaHNXdOKWkqeGZAzZiJk3wBfO3Jl/5XViXo78d1n3WXc2aigdVrixs5Q4vQ8KzN6XY5a46LujSpJ1Rfy9NMO4izBHY2xSvw1WcrfSeLtofHeiQ== tpope@issh
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCeQTPlgiMzLPqEuoxfr7ttyLaop9zXjZcTsuuSfXRxBf3m7E/RrHdp/LJll1VvwWH6qvteCnZNvTOx1SKmSc/hepK4BVoZjzLvENdYsNoH27jzbCl1ii9GNQ6UYqpNy1/JmJ7hULeNbQNTDrSWGh8humH/FIrrcCfmiRwxXZTCkn2oE4l3DRlwsmdY7/hvHon3KT8gq56TmFrnLSXa1VcxrMlfou+tIMxc/c2g5YdW8Ay3grg7mtVLMAw1k/y4tM7XZcwfceLRf0K6DVBOCtojYHK6oZEs0OwybDqd/hsi+oQIXHSJcqqHOGMw2O+vhvJgW7527wp1UmsNBOv3Aq2j tpope@connectbot
View
18 .ssh/config
@@ -21,11 +21,10 @@ Host *.tpope.us matthew* todd* lucas* gideon* roxy*
Host trp
ProxyCommand none
- Hostname tpope.us
+ Hostname tpope.dyndns.org
HostKeyAlias michael
CheckHostIP no
ForwardX11 no
- ServerAliveInterval 240
Host *.p
ProxyCommand connect -H www.tpope.net `echo %h|sed -e s/\.p$//` %p
@@ -34,21 +33,14 @@ Host *.proxy
ProxyCommand connect -H www.tpope.net `echo %h|sed -e s/\.proxy$//` %p
Host *.tpope.us *.t
- ProxyCommand ssh -ax trp nc -q 1 `echo %h|sed -e s/\.t.*$//` %p 2>/dev/null
+ ProxyCommand ssh -ax trp nc -q 1 `echo %h|sed -e 's/\.t.*$//'` %p 2>/dev/null
Host tpope.us cunn.iling.us
CheckHostIP no
- # DynamicForward 1080
Host tpope.net tpo.pe
- HostName maeby.tpope.net
- ServerAliveInterval 240
-
-Host github.com
- User git
-
-Host *.h
- ProxyCommand ssh -ax ci.hshrckt.com nc -q 1 `echo %h|sed -e 's/\.h.*$/.local/'` %p 2>/dev/null
+ HostKeyAlias roxy
+ HostName roxy.tpope.net
Host *.* localhost
ProxyCommand none
@@ -57,3 +49,5 @@ Host *
User tpope
ForwardAgent yes
ProxyCommand sh -c '$HOME/bin/tpope hostman --tunnel %h %p'
+ ControlMaster auto
+ ControlPath /tmp/ssh_mux_tpope_%h_%p_%r
View
15 .tmux.conf
@@ -1,7 +1,8 @@
-set -g prefix C-z,C-\,C-q
-bind z send-keys C-z
-bind \ send-keys C-\
-bind Q send-keys C-q
-bind ` select-window -t 0
-
-setw -g mode-keys vi
+set-window-option -g mode-keys vi
+set-window-option -g alternate-screen off
+set-option -g default-terminal "screen-256color"
+set-option -g set-titles on
+set-option -g prefix C-z
+bind z send-keys C-z
+bind C-z last-window
+bind ` select-window -t 0
View
6 .zshenv
@@ -1,10 +1,10 @@
# ~/.zshenv
typeset -U path
-for dir in /bin /usr/bin /usr/ucb /usr/local/bin /opt/local/bin /opt/sfw/bin "$HOME/bin"; do
+for dir in /bin /usr/ucb /usr/local/bin /opt/local/bin /opt/sfw/bin "$HOME/bin"; do
[ -d "$dir" ] && path=($dir $path)
done
-for dir in /usr/bin/X11 /opt/sfw/kde/bin /usr/openwin/bin /usr/dt/bin /usr/games /usr/bin/surfraw-elvi /var/lib/gems/1.8/bin /usr/local/sbin /usr/sbin /sbin /usr/etc; do
+for dir in /usr/bin /usr/bin/X11 /opt/sfw/kde/bin /usr/openwin/bin /usr/dt/bin /usr/games /usr/bin/surfraw-elvi /var/lib/gems/1.8/bin /usr/local/sbin /usr/sbin /sbin /usr/etc; do
[ -d "$dir" ] && path=($path $dir)
done
path=($HOME/bin $path /usr/bin/X11 /usr/games /usr/local/sbin /usr/sbin /sbin)
@@ -40,7 +40,7 @@ done
RUBYLIB="`echo "$RUBYLIB"|sed -e s/^://`"
[ ! -f "$HOME/.ruby/lib/tpope.rb" ] || RUBYOPT="rtpope"
-export ENV="$HOME/.shrc" CLASSPATH PERL5LIB PERL5OPT
+export ENV="$HOME/.shrc" CLASSPATH PERL5LIB PERL5OPT RUBYLIB RUBYOPT
if false && [ -t 1 ]; then
local tinfo=/usr/share/terminfo
View
10 .zshrc
@@ -12,7 +12,7 @@ if [[ $ZSH_VERSION == 4.<->* ]]; then
setopt histexpiredupsfirst histreduceblanks
fi
-fpath=($fpath ~/.zsh/functions ~/.zsh/functions.zwc ~/.rvm/scripts/zsh/Completion)
+fpath=($fpath ~/.zsh/functions ~/.zsh/functions.zwc ~/.rvm/scripts/zsh/Completion $HASHROCKET_DIR/dotmatrix/.zsh/functions)
watch=(notme)
[ -f "$HOME/.friends" ] && watch=(`cat "$HOME/.friends"`)
HISTSIZE=100
@@ -108,7 +108,7 @@ esac
[ $UID = '0' ] && usercolor="$fg_bold[white]"
reset_color=$'\e[00m'
-PROMPT="%{$usercolor%}%n%{${e}[00m%}@%{${e}[${hostcolor}m%}%m%{${e}[00m%}:%{$dircolor%}%20<...<%~%<<%{${e}[00m%}%{${e}[00m%}\$(git_prompt_info)%# "
+PROMPT="%{$usercolor%}%n%{${e}[00m%}@%{${e}[${hostcolor}m%}%m%{${e}[00m%}:%{$dircolor%}%30<...<%~%<<%{${e}[00m%}%{${e}[00m%}\$(git_prompt_info)%# "
RPS1="%(?..(%{${e}[01;35m%}%?%{${e}[00m%}%)%<<)"
setopt promptsubst
@@ -257,6 +257,7 @@ esac
alias lsd='ls -ld *(-/DN)' # directories only
alias sb='noglob sensible-browser'
alias zmv='noglob zmv'
+alias ru='noglob ru'
which sudo >/dev/null && alias sudo='sudo ' # this makes $1 expand as an alias
@@ -301,8 +302,6 @@ zstyle -e ':completion:*' completer '
reply=(_complete _ignored:complete _prefix _complete:full _correct _approximate)
fi' #'
zstyle ':completion::prefix:*' completer _complete _ignored:complete
-#zstyle ':completion:*' completer _complete _ignored _prefix
-#zstyle ':completion:*' completions 1
zstyle ':completion:*' format 'Completing %d'
zstyle ':completion:*' glob 1
zstyle ':completion::complete:*:(all-|)files' ignored-patterns '*\~' '(|*/)CVS'
@@ -321,11 +320,9 @@ zstyle ':completion:*' list-prompt '%SAt %p: Hit TAB for more, or the character
zstyle ':completion:*' local localhost /var/www public_html
zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}'
zstyle ':completion::full:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' '+r:|[._-/]=* r:|=* l:|[._-/]=* l:|=*'
-#zstyle ':completion:*:hosts' hosts ${(A)_cache_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}} }
zstyle -e ':completion:*' max-errors 'reply=( $(( ($#PREFIX+$#SUFFIX+1)/3 )) numeric )'
zstyle ':completion:*' menu select
zstyle ':completion:*:(xdvi|xpdf|gv|mpl):*' menu yes select
-zstyle ':completion:*:(xdvi|xpdf|gv|mplayer):*' file-sort time
zstyle ':completion:*' original true
zstyle ':completion:*' select-prompt '%SScrolling active: current selection at %p%s'
zstyle ':completion:*' substitute 1
@@ -334,7 +331,6 @@ zstyle ':completion:*' cache-path ~/.zsh/cache
zstyle ':completion:*' users tpope root $USER ${watch/notme/}
zstyle ':completion:*' verbose true
zstyle ':completion:*:rm:*' ignore-line yes
-#zstyle ':completion:*:rsync:*:files' command ssh -a -x '${words[CURRENT]%:*}' ls -d1F '${${:-${${${:-${words[CURRENT]#*:}-}:h}/${slash}(#e)/}/\*}/#.$slash/}' 2>/dev/null
zstyle :compinstall filename "$HOME/.zshrc"
autoload -U compinit
View
10 bin/sensible-browser
@@ -6,7 +6,7 @@
# a gui browser, and -dump a formatted dump of the website.
[ "$PATH" ] || PATH="$HOME/bin:/usr/local/bin:/usr/bin/X11:/usr/bin:/bin"
-ulimit -u 128 >/dev/null 2>/dev/null
+ulimit -u 256 >/dev/null 2>/dev/null
[ -f "$HOME/.sb.local" ] && . "$HOME/.sb.local"
if [ "$1" = "-T" ]; then
@@ -45,9 +45,9 @@ fvwm_find_browser() {
return 0
}
-if [ -x "`which cygstart 2>/dev/null`" -a -z "$terminal" ]; then
+if [ -x /usr/bin/cygstart -a -z "$terminal" ]; then
exec cygstart "$*"
-elif [ "`uname`" = Darwin -a -x "`which open 2>/dev/null`" -a -z "$terminal" ]; then
+elif [ -n "$SECURITYSESSIONID" -o -n "$Apple_PubSub_Socket_Render" ] && [ -x /usr/bin/open -a -z "$terminal" ]; then
exec open "$*"
elif [ "$DISPLAY" -a -z "$terminal" ]; then
url="$*"
@@ -104,7 +104,7 @@ elif [ "$DISPLAY" -a -z "$terminal" ]; then
[ -d "$dir" ] || new=1
nohup nice -n 1 $browser "$@" >/dev/null 2>/dev/null &
disown >/dev/null 2>&1
- sleep 20
+ sleep 5
if [ "$new" -a -d "$dir" ]; then
if killall $browser-bin 2>/dev/null; then
echo 'Performing an initial "tpope installer"'
@@ -114,7 +114,7 @@ elif [ "$DISPLAY" -a -z "$terminal" ]; then
echo 'Restarting browser so changes will take effect'
nohup nice -n 1 $browser "$@" >/dev/null 2>/dev/null &
disown >/dev/null 2>&1
- sleep 20
+ sleep 5
else
echo 'Performing an initial "tpope installer"'
tpope installer
View
4 bin/sync-tpope
@@ -11,8 +11,8 @@
FILES="\
.zshenv .zshrc .zlogin .zlogout .zsh/functions/* .shrc .cshrc .login .logout \
- .profile .bashrc .bash_profile .inputrc .screenrc .terminfo/? .dir_colors \
- .vimrc .vim/[^b][^p]* .muttrc .urlview .mailcap .gnupg/gpg.conf \
+ .profile .bashrc .bash_profile .inputrc .screenrc .tmux.conf .dir_colors \
+ .terminfo/? .vimrc .vim/[acdimpst]* .muttrc .urlview .mailcap .gnupg/gpg.conf \
.cvsignore .ssh/config .ssh/authorized_keys .ssh/authorized_keys2 .gitconfig \
.xsession .Xresources .Eterm/themes .gtkrc .gtkrc-2.0 .netscape/user.js \
.pixmaps/mini .fvwm/.fvwm2rc .fvwm/FvwmScript-* .fvwm/.fvwm-menu-headlines \
View
27 bin/tpope
@@ -507,8 +507,6 @@ case "$basename" in
screen|s)
if [ "$TERM" = "rxvt" -a -f /usr/share/terminfo/r/rxvt-unicode ]; then
TERM=rxvt-unicode
- elif [ "$TERM" = "rxvt-unicode" -a ! -f /usr/share/terminfo/r/rxvt-unicode ]; then
- TERM=rxvt
fi
exec screen "$@"
;;
@@ -696,20 +694,25 @@ case "$basename" in
SUBDIRECTORY_OK=1
. git-sh-setup
[ -n "$1" ] || usage
- head="`git branch|grep '^\* '|cut -b 3-`"
+ umask 002
trap 'rm -rf /tmp/git-publish.$$' EXIT
mkdir -m 02700 /tmp/git-publish.$$
- umask 002
dir=/tmp/git-publish.$$/repo.git
- git clone --bare "$GIT_DIR" $dir
- GIT_CONFIG=$dir/config git-config --add core.sharedrepository group
- find $dir -type d -exec chmod g+ws {} \;
- chmod +x $dir/hooks/post-update
- touch $dir/git-daemon-export-ok
- scp -pqr $dir "$1" || exit 1
+ GIT_DIR="$dir" git init --quiet --shared=group
+ GIT_DIR="$dir" git config --remove-section receive
+ chmod +x "$dir/hooks/post-update"
+ touch "$dir/git-daemon-export-ok"
+ #git clone --bare "$GIT_DIR" $dir
+ #GIT_CONFIG=$dir/config git-config --add core.sharedrepository group
+ #find $dir -type d -exec chmod g+ws {} \;
+ #chmod +x $dir/hooks/post-update
+ #touch $dir/git-daemon-export-ok
+ cp "$GIT_DIR/description" "$dir/description"
+ scp -pqr "$dir" "$1" || exit 1
git remote add origin "$1" &&
- git config branch."$head".remote origin &&
- git config branch."$head".merge "refs/heads/$head"
+ git config branch.master.remote origin &&
+ git config branch.master.merge "refs/heads/master" &&
+ git push origin "master:refs/heads/master"
;;
rds)
Please sign in to comment.
Something went wrong with that request. Please try again.