From 6b244ec7db9490d682dcc652c09d63e140169c82 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Mon, 8 Aug 2011 17:38:00 +1000 Subject: [PATCH] Unify `map`ings and update fuf shortcuts --- .vimrc | 111 ++++++++--------- .zshenv | 367 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- .zshrc | 366 ------------------------------------------------------- 3 files changed, 422 insertions(+), 422 deletions(-) mode change 120000 => 100644 .zshenv delete mode 100644 .zshrc diff --git a/.vimrc b/.vimrc index f32efbc..93f3b53 100644 --- a/.vimrc +++ b/.vimrc @@ -647,28 +647,28 @@ nmap :colder nmap :cnewer " Make S-up/down do gk/gj {{{2 -inoremap gk -inoremap gj -noremap gk -noremap gj +imap gk +imap gj +map gk +map gj " Better Bépo movement {{{2 -noremap © h -noremap þ j -noremap ß k -noremap ® l +map © h +map þ j +map ß k +map ® l " Make / page up/down {{{2 -noremap -noremap +map +map " Scrolling with arrows controls the window {{{2 -noremap -noremap +map +map " Useful things from inside imode {{{2 -inoremap w :w -inoremap q gq}k$ +imap w :w +imap q gq}k$ " Commonly used commands {{{2 "nmap :silent nohlsearch @@ -686,7 +686,7 @@ nmap :exec "make -C " . expand("%:p:h") " \ . " TESTS=" . GetCurrentTest() " Insert a single char {{{2 -noremap i ir +map i ir " Split the line into a (n)ew line or an (o)pen line {{{2 nmap n \i @@ -696,33 +696,33 @@ nmap o \ik$ noremap J :s/\%#\(.*\)\n\(.*\)/\2\1 " In normal mode, jj or jl escapes {{{2 -inoremap jj -inoremap jl +imap jj +imap jl " Kill line like emacs {{{2 -"noremap "_dd +"map "_dd " Select everything {{{2 -noremap gg ggVG +map gg ggVG " Reformat everything {{{2 -noremap gq gggqG +map gq gggqG " Reformat paragraph {{{2 -noremap gp gqap +map gp gqap " Clear lines {{{2 -"noremap clr :s/^.*$//:nohls +"map clr :s/^.*$//:nohls " Delete blank lines {{{2 -noremap dbl :g/^$/d:nohls +map dbl :g/^$/d:nohls " Enclose each selected line with markers {{{2 -noremap enc :execute +map enc :execute \ substitute(":'<,'>s/^.*/#&#/ \| :nohls", "#", input(">"), "g") " Edit something in the current directory {{{2 -noremap ed :e =expand("%:p:h")/ +map ed :e =expand("%:p:h")/ " Enable fancy % matching {{{2 if has("eval") @@ -758,7 +758,7 @@ if has("eval") norm o call setline(line("."), "#endif") endfun - noremap ig :call MakeIncludeGuards() + map ig :call MakeIncludeGuards() endif " javascript folding {{{2 @@ -841,12 +841,12 @@ if v:version >= 700 && has("eval") endif endfun - noremap sh :call SwitchHeader(0) - noremap st :call SwitchTest(0) - noremap sk :call SwitchMakefile(0) - noremap ssh :call SwitchHeader(1) - noremap sst :call SwitchTest(1) - noremap ssk :call SwitchMakefile(1) + map sh :call SwitchHeader(0) + map st :call SwitchTest(0) + map sk :call SwitchMakefile(0) + map ssh :call SwitchHeader(1) + map sst :call SwitchTest(1) + map ssk :call SwitchMakefile(1) endif " super i_c-y / i_c-e {{{2 @@ -898,8 +898,8 @@ if v:version >= 700 && has("eval") endif endfun - inoremap y :call SuperYank(-1) - inoremap e :call SuperYank(1) + imap y :call SuperYank(-1) + imap e :call SuperYank(1) endif " tab completion {{{2 @@ -911,8 +911,8 @@ if has("eval") return "\" endif endfun - inoremap =CleverTab() - inoremap + imap =CleverTab() + imap endif " ^n Show number and fold columns in windows {{{2 @@ -939,7 +939,7 @@ if has("eval") endif endfun "autocmd WinEnter,BufWinEnter,BufNew * :call FoldNumbers() - noremap :call FoldNumbers() + map :call FoldNumbers() endif " }}}1 @@ -1046,7 +1046,7 @@ if has("eval") let Tlist_Exit_OnlyWindow=1 let Tlist_File_Fold_Auto_Close=1 let Tlist_Inc_Winwidth=0 - "nnoremap :Tlist + "nmap :Tlist " Settings minibufexpl.vim "let g:miniBufExplModSelTarget = 1 @@ -1162,31 +1162,32 @@ map :2split ~/.vim/fun_ref.vim map :set rnu! map :set nu! map ggVGg? -noremap :set encoding=utf-8:set fenc=utf-8 -noremap :set encoding=iso8859-15:set fenc=iso8859-15 +map :set encoding=utf-8:set fenc=utf-8 +map :set encoding=iso8859-15:set fenc=iso8859-15 "map :SpellProposeAlternatives "map :SpellCheck "map :let spell_language_list = "english,spanish" -"nnoremap :Tlist -"nnoremap :TlistSync -nnoremap :noh +"nmap :Tlist +"nmap :TlistSync +nmap :noh map !!date map :TC -nnoremap :X :x -nnoremap :W :w -nnoremap :Q :q -nnoremap :B :b -noremap rg :color relaxedgreen -noremap ip :color inkpot -noremap ir :color ir_black -noremap mv :color macvim:set background=light -map f :FufFile +nmap :X :x +nmap :W :w +nmap :Q :q +nmap :B :b +map rg :color relaxedgreen +map ip :color inkpot +map ir :color ir_black +map mv :color macvim:set background=light +map f :FufFileWithCurrentBufferDir +map v :FufCoverageFile map b :FufBuffer -map c :FufDir +map c :FufDirWithFullCwd map w :bdelete map :FufHelp -noremap :syntax sync fromstart -inoremap :syntax sync fromstart +map :syntax sync fromstart +imap :syntax sync fromstart syntax sync minlines=200 " NERD tree. Yay! diff --git a/.zshenv b/.zshenv deleted file mode 120000 index ed08148..0000000 --- a/.zshenv +++ /dev/null @@ -1 +0,0 @@ -.zshrc \ No newline at end of file diff --git a/.zshenv b/.zshenv new file mode 100644 index 0000000..cf13142 --- /dev/null +++ b/.zshenv @@ -0,0 +1,366 @@ +## Profiling options +#PS4='+$(date "+%s:%N") %N:%i> ' +#exec 3>&2 2>/tmp/zsh-startlog.$$ +#setopt prompt_subst +#setopt xtrace + +typeset -ga preexec_functions +typeset -ga precmd_functions +typeset -ga chpwd_functions +fpath=($fpath $HOME/.zsh/func) +#typeset -u fpath + +# Options +setopt appendhistory hist_ignore_space hist_ignore_all_dups extendedglob nomatch notify dvorak # correct +unsetopt beep +bindkey -e + +zstyle :compinstall filename '~/.zshrc' +autoload -Uz compinit colors zgitinit && colors && zgitinit +compinit -u +#bindkey '^L' push-line +bindkey "^I" expand-or-complete-prefix +umask 022 + +# Fix $TERM +if [ -f /etc/termcap ] ; then + export TERMCAP=/etc/termcap +fi +case "$TERM" in + rxvt-unicode) export TERM=rxvt;; + rxvt-256color) export TERM=rxvt;; +esac + +# Paths +#export LD_LIBRARY_PATH=/opt/csw/lib +#zsh's path +export PATH=/usr/sbin:/usr/bin:/sbin:/bin +export MANPATH=~/local/share/man:/usr/man:/usr/share/man +paths=(/cat/bin /cat/games/bin /opt/csw/sbin /opt/csw/bin /pkgs/ghc/current/bin +/pkgs/chromium/bin /usr/sfw/sbin /usr/sfw/bin /opt/SUNWut/sbin /opt/SUNWut/bin +/usr/ccs/bin /opt/local/sbin /opt/local/bin /usr/local/share/bin /usr/openwin/bin /usr/bin/X11 +/usr/local/bin/X11 /usr/openwin/bin/xview /opt/java/bin /opt/java5/bin +/opt/java/jre/bin /opt/openoffice/program) +prepaths=(/usr/local/bin /usr/local/sbin ~/.cabal/bin ~/local/bin ~/local/sbin +~/local/share/bin) +for dir in $paths ; do + if [ -d $dir ] ; then + export PATH=$PATH:$dir + fi + if [ -d `dirname $dir`/man ] ; then + export MANPATH=$MANPATH:`dirname $dir`/man + fi +done +for dir in $prepaths ; do + if [ -d $dir ] ; then + export PATH=$dir:$PATH + fi + if [ -d `dirname $dir`/man ] ; then + export MANPATH=`dirname $dir`/man:$MANPATH + fi +done +# Load profiles from /etc/profile.d +if test -d /etc/profile.d/; then + for profile in /etc/profile.d/*.sh; do + test -x $profile && . $profile + done + unset profile +fi +#gem's path +if [ -d ~/.gems/bin ] ; then + export PATH="$HOME/.gems/bin:$PATH" +fi +if [ -d ~/.gem/ruby/1.8/bin ] ; then + export PATH="$PATH:$HOME/.gem/ruby/1.8/bin" +fi +#for dir in `find /opt/*/bin|grep /bin$` `find /opt/csw/*/bin|grep /bin$` ; do +# export PATH=$PATH:$dir +#done + +[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function + + +# Setting vars +#TERM=rxvt +#export GEM_HOME="$HOME/.gems" +#export GEM_HOME="/Library/Ruby/Gems/1.8" +#export GEM_PATH="$GEM_HOME:/usr/lib/ruby/gems/1.8" +#export GEM_PATH="/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/gems/1.8" +zshhosts=(serenity.cat.pdx.edu hunner@mint.cic.pdx.edu drkatz.cat.pdx.edu walt.ece.pdx.edu bunny.cat.pdx.edu spof.cat.pdx.edu fops.cat.pdx.edu narsil.cat.pdx.edu hunner@odin.pdx.edu hunnur@alcmaeonllc.com mir.cat.pdx.edu geppetto.cat.pdx.edu) +HISTSIZE=1000 +SAVEHIST=1000 +HISTFILE=~/.history +export GPGKEY="48C7AF0C" +export NETHACKOPTIONS='autopickup,color,!cmdassist,!number_pad,hilite_pet,boulder:0,pickup_types:$"=/!?+,menustyle:partial,!legacy,suppress_alert:3.3.1' + +# Prompt +#PS1="%m%# " +prompt_precmd() { + gitcolor="" + if zgit_isgit ; then + if ! zgit_isindexclean ; then + #PROMPT="[%F{$usercolor}%n%F{white}@%F{$hostcolor}%m%F{white}:%F{blue}%~%f](%F{cyan}$(zgit_branch)%f)>" + gitcolor=$fg[blue] + elif ! zgit_isworktreeclean ; then + #PROMPT="[%F{$usercolor}%n%F{white}@%F{$hostcolor}%m%F{white}:%F{blue}%~%f]>" + gitcolor=$fg[green] + fi + fi + color="%(?.$gitcolor.$fg[red])" + PROMPT="%m$color%#%{$reset_color%} " +} +#precmd_functions+=prompt_precmd +PROMPT="%m%# " + +if [ `uname -s` = "SunOS" ] ; then + export LANG="C" +else + export LANG="en_US.UTF-8" +fi +#export LC_CTYPE="en_US.UTF-8" +export LC_COLLATE="C" #order files in ls +#export LC_TIME="en_US.UTF-8" +#export LC_NUMERIC="en_US.UTF-8" +#export LC_MONETARY="en_US.UTF-8" +#export LC_MESSAGES="en_US.UTF-8" +#export LC_ALL='en_US.utf8' +export DIALOGOPTS='--visit-items' +export MAIL=~/mail +export MAILCHECK=0 +#export AWT_TOOLKIT=MToolkit +#export AWT_TOOLKIT=XToolkit +export _JAVA_AWT_WM_NONREPARENTING=1 +if [ -x `whence less` ] ; then + export PAGER==less +else + export PAGER==more +fi +if [ -z "$PERL5LIB" ] ; then + # If PERL5LIB wasn't previously defined, set it... + export PERL5LIB=~/local/lib/perl5:~/local/lib/perl5/site_perl +else + # ...otherwise, extend it. + export PERL5LIB=$PERL5LIB:~/local/lib/perl5:~/local/lib/perl5/site_perl +fi + +## Set up vim aliases +if whence vim > /dev/null ; then + VIM=vim + if whence mvim > /dev/null ; then + #VIM=mvim + VIM="mvim -c 'au VimLeave * maca hide:'" + fi +else + VIM=vi +fi +export VISUAL="$VIM -f" +export EDITOR="$VIM -f" +alias v=$VIM +alias vh="mvim -c 'au VimLeave * maca hide:'" +alias vi=$VIM +alias vr="$VIM --remote-tab" +alias vl="$VIM --serverlist" +vs() { $VIM --servername $1 --remote-tab $argv[2,$] } +alias vd=${VIM}diff +alias vir=vr +alias vis=vs +alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'" + +## For forwarding ssh auth I think +if [ -n "$SSH_AUTH_SOCK" ] ; then + ln -fs $SSH_AUTH_SOCK $HOME/.ssh-agent +fi + +## Add extra fonts +#xset fp+ /usr/APL2/fonts/X11 +#xset fp rehash + +## Set up ruby gems for $RUBYLIB +#if [ -d $HOME/.gems/gems ] ; then +# for rlib in $HOME/.gems/gems/*/lib ; do +# export RUBYLIB=$RUBYLIB:$rlib +# done +#fi +#for rubylib in /usr/lib/ruby/gems/1.8/gems/*/lib ; do +# export RUBYLIB=$RUBYLIB:$rubylib +#done + +# Aliases +alias ls="ls -F" +alias l="ls -F" +alias ll="l -Fl" +alias la="l -Fa" +alias lla="ll -Fa" +alias c="cd" +cl() { cd $@ && ls } +alias e="TERM=rxvt-256color; emacs -nw" +alias et="TERM=rxvt-256color; emacsclient -t" +alias ec="emacsclient -c --eval '(set-background-color \"black\")'" +alias ecx="emacsclient --eval '(make-frame-on-display \"$DISPLAY\")'" +#alias s="TERM=xterm;ssh serenity.cat.pdx.edu" +alias s="TERM=rxvt;ssh hunner@serenity.cat.pdx.edu" +alias f="TERM=rxvt;ssh hunner@firefly.cat.pdx.edu" +alias z="TERM=rxvt;ssh hunner@zabava.cat.pdx.edu" +alias o="TERM=rxvt;ssh hunner@osiris.cat.pdx.edu" +alias m="TERM=rxvt;ssh hunner@mint.cic.pdx.edu" +alias chandra="TERM=rxvt;ssh hunner@chandra.cs.pdx.edu" +export CS=cs.pdx.edu +alias odin="TERM=xterm;ssh hunner@odin.pdx.edu" +alias budda="ssh hunnur@budda.dreamhost.com" +alias kvar="ssh hunner@131.252.134.134" +alias kvin="ssh hunner@131.252.135.22" +alias mutt="TERM=xterm-256color mutt" +alias x="exit" +alias gpg-add="/usr/libexec/gpg-preset-passphrase" +alias rsync="rsync -azPHe ssh" #-a equals -rlptgoD +alias mang="cd ~/zips/mangband ; DISPLAY=\"\" ./mangclient" +alias nh="export HISTFILE=/dev/null" +#alias cl="co -l" +alias cu="ci -u" +alias sl="screen -ls" +alias sr="screen -r" +alias sx="screen -x" +alias srd="screen -rd" +alias t="TERM=xterm-256color tmux at" +alias tl="tmux ls" +alias bc="bc -q" +alias fm="fmstatus.sh&;shell-fm" +alias apl="gvim -font 'APL385 Unicode 14' -c 'set keymap=uniapl385'" +alias d="dtach -a ~/.dtach" +alias eo="xmodmap ~/keymaps/eo_dv_hunner.pke" +alias vt="export TERM=vt220" +alias rm=rm; unalias rm #hack +alias g="git" +alias gl="git lg" +alias gp="git push" +alias gu="git pull" +alias gs="git status" +alias gm="git mv" +alias gr="git rm" +alias ga="git add" +alias gaf="git add --force" +alias gb="git branch" +alias gc="git commit" +alias gca="git commit --amend" +alias gd="git diff" +alias gdw="git diff --color-words" +alias gdt="git difftool" +alias go="git checkout" +alias gob="git checkout -b" +alias gk="gitk --all&" +alias gx="gitx --all" +alias uzbl="uzbl-browser" +alias hide="SetFile -a V" +alias show="SetFile -a v" +#startup aliases +alias -s pdf="zathura" +alias -s txt="vi" +alias -s flv="mplayer" +alias -s avi="mplayer" +alias -s mkv="mplayer" +alias -s mpg="mplayer" + +# Functions +args() { echo $#; } +title() { WINTITLE="$*"; print -Pn "\e]0;$WINTITLE\a" } +#if [ x$WINDOW != x ]; then +# # Running under screen(1) +# precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [%~]\a" || : } +# preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [$1]\a" || : } +#else +# precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [%~]\a" || : } +# preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : } +#fi +if [ x$DISPLAY != x ] ; then + precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [%~]\a" || : } + preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : } +fi +alias resize="printf '\33]50;%s%d\007' 'xft:Terminus:pixelsize=' $1" # ':antialias=true'" +alias asdf="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY" +alias auie="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY" +alias aoeu='setxkbmap us' +alias bepo='setxkbmap fr bepo "ctrl:swapcaps"' +if [ -f $HOME/.termcap ] ; then + TERMCAP=$(< $HOME/.termcap) + export TERMCAP +fi +make_termcap() { + cat > $HOME/.termcap << EOF +rxvt-256color|rxvt-256color terminal (X Window System):\ + :Co#256:\ + :tc=rxvt-unicode:\ + :tc=rxvt: +EOF +} +type7() { + if [ `uname -s` = "SunOS" ] ; then + xmodmap ~/keymaps/eo_dv_hunner_type7_sol.pke + else + xmodmap ~/keymaps/nu_type7.pke + fi +} +zpush() { + for host in $zshhosts ; do + files=(.zshrc .vim .vimrc) + if [ x$(hostname) = x$host ] ; then + continue + fi + if [ $(uname) = "Linux" ] ; then + ping -c1 -W1 ${host#*@} > /dev/null + else + ping -c1 -t1 ${host#*@} > /dev/null + fi + if [ $status -eq 0 ] ; then + echo -n "$host: copying" + for file in $files ; do + echo -n . + if ! rsync -azPH $file $host:~ > /dev/null ; then continue 2 ; fi + done + echo "done" + #rsync .zshenv $host:~ > /dev/null + else + echo "$host: unpings" + fi + done; +} +function r() { + if [[ -n $TMUX ]]; then + NEW_SSH_AUTH_SOCK=`tmux showenv|grep ^SSH_AUTH_SOCK|cut -d = -f 2` + if [[ -n $NEW_SSH_AUTH_SOCK ]] && [[ -S $NEW_SSH_AUTH_SOCK ]]; then + SSH_AUTH_SOCK=$NEW_SSH_AUTH_SOCK + fi + fi +} +ex () { + if whence gtar > /dev/null ; then + TAR=gtar + else + TAR=tar + fi + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) $TAR xvjf $1 ;; + *.tar.gz) $TAR xvzf $1 ;; + *.tar.xz) $TAR xvJf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar x $1 ;; + *.gz) gunzip $1 ;; + *.xz) unxz $1 ;; + *.tar) $TAR xvf $1 ;; + *.tbz2) $TAR xvjf $1 ;; + *.tbz) $TAR xvjf $1 ;; + *.tgz) $TAR xvzf $1 ;; + *.txz) $TAR xvJf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1 ;; + *.7z) 7z x $1 ;; + *) echo "don't know how to extract '$1'..." ;; + esac + else + echo "'$1' is not a valid file!" + fi +} + +## Profiling options +#unsetopt xtrace +#exec 2>&3 3>&- diff --git a/.zshrc b/.zshrc deleted file mode 100644 index cf13142..0000000 --- a/.zshrc +++ /dev/null @@ -1,366 +0,0 @@ -## Profiling options -#PS4='+$(date "+%s:%N") %N:%i> ' -#exec 3>&2 2>/tmp/zsh-startlog.$$ -#setopt prompt_subst -#setopt xtrace - -typeset -ga preexec_functions -typeset -ga precmd_functions -typeset -ga chpwd_functions -fpath=($fpath $HOME/.zsh/func) -#typeset -u fpath - -# Options -setopt appendhistory hist_ignore_space hist_ignore_all_dups extendedglob nomatch notify dvorak # correct -unsetopt beep -bindkey -e - -zstyle :compinstall filename '~/.zshrc' -autoload -Uz compinit colors zgitinit && colors && zgitinit -compinit -u -#bindkey '^L' push-line -bindkey "^I" expand-or-complete-prefix -umask 022 - -# Fix $TERM -if [ -f /etc/termcap ] ; then - export TERMCAP=/etc/termcap -fi -case "$TERM" in - rxvt-unicode) export TERM=rxvt;; - rxvt-256color) export TERM=rxvt;; -esac - -# Paths -#export LD_LIBRARY_PATH=/opt/csw/lib -#zsh's path -export PATH=/usr/sbin:/usr/bin:/sbin:/bin -export MANPATH=~/local/share/man:/usr/man:/usr/share/man -paths=(/cat/bin /cat/games/bin /opt/csw/sbin /opt/csw/bin /pkgs/ghc/current/bin -/pkgs/chromium/bin /usr/sfw/sbin /usr/sfw/bin /opt/SUNWut/sbin /opt/SUNWut/bin -/usr/ccs/bin /opt/local/sbin /opt/local/bin /usr/local/share/bin /usr/openwin/bin /usr/bin/X11 -/usr/local/bin/X11 /usr/openwin/bin/xview /opt/java/bin /opt/java5/bin -/opt/java/jre/bin /opt/openoffice/program) -prepaths=(/usr/local/bin /usr/local/sbin ~/.cabal/bin ~/local/bin ~/local/sbin -~/local/share/bin) -for dir in $paths ; do - if [ -d $dir ] ; then - export PATH=$PATH:$dir - fi - if [ -d `dirname $dir`/man ] ; then - export MANPATH=$MANPATH:`dirname $dir`/man - fi -done -for dir in $prepaths ; do - if [ -d $dir ] ; then - export PATH=$dir:$PATH - fi - if [ -d `dirname $dir`/man ] ; then - export MANPATH=`dirname $dir`/man:$MANPATH - fi -done -# Load profiles from /etc/profile.d -if test -d /etc/profile.d/; then - for profile in /etc/profile.d/*.sh; do - test -x $profile && . $profile - done - unset profile -fi -#gem's path -if [ -d ~/.gems/bin ] ; then - export PATH="$HOME/.gems/bin:$PATH" -fi -if [ -d ~/.gem/ruby/1.8/bin ] ; then - export PATH="$PATH:$HOME/.gem/ruby/1.8/bin" -fi -#for dir in `find /opt/*/bin|grep /bin$` `find /opt/csw/*/bin|grep /bin$` ; do -# export PATH=$PATH:$dir -#done - -[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function - - -# Setting vars -#TERM=rxvt -#export GEM_HOME="$HOME/.gems" -#export GEM_HOME="/Library/Ruby/Gems/1.8" -#export GEM_PATH="$GEM_HOME:/usr/lib/ruby/gems/1.8" -#export GEM_PATH="/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/gems/1.8" -zshhosts=(serenity.cat.pdx.edu hunner@mint.cic.pdx.edu drkatz.cat.pdx.edu walt.ece.pdx.edu bunny.cat.pdx.edu spof.cat.pdx.edu fops.cat.pdx.edu narsil.cat.pdx.edu hunner@odin.pdx.edu hunnur@alcmaeonllc.com mir.cat.pdx.edu geppetto.cat.pdx.edu) -HISTSIZE=1000 -SAVEHIST=1000 -HISTFILE=~/.history -export GPGKEY="48C7AF0C" -export NETHACKOPTIONS='autopickup,color,!cmdassist,!number_pad,hilite_pet,boulder:0,pickup_types:$"=/!?+,menustyle:partial,!legacy,suppress_alert:3.3.1' - -# Prompt -#PS1="%m%# " -prompt_precmd() { - gitcolor="" - if zgit_isgit ; then - if ! zgit_isindexclean ; then - #PROMPT="[%F{$usercolor}%n%F{white}@%F{$hostcolor}%m%F{white}:%F{blue}%~%f](%F{cyan}$(zgit_branch)%f)>" - gitcolor=$fg[blue] - elif ! zgit_isworktreeclean ; then - #PROMPT="[%F{$usercolor}%n%F{white}@%F{$hostcolor}%m%F{white}:%F{blue}%~%f]>" - gitcolor=$fg[green] - fi - fi - color="%(?.$gitcolor.$fg[red])" - PROMPT="%m$color%#%{$reset_color%} " -} -#precmd_functions+=prompt_precmd -PROMPT="%m%# " - -if [ `uname -s` = "SunOS" ] ; then - export LANG="C" -else - export LANG="en_US.UTF-8" -fi -#export LC_CTYPE="en_US.UTF-8" -export LC_COLLATE="C" #order files in ls -#export LC_TIME="en_US.UTF-8" -#export LC_NUMERIC="en_US.UTF-8" -#export LC_MONETARY="en_US.UTF-8" -#export LC_MESSAGES="en_US.UTF-8" -#export LC_ALL='en_US.utf8' -export DIALOGOPTS='--visit-items' -export MAIL=~/mail -export MAILCHECK=0 -#export AWT_TOOLKIT=MToolkit -#export AWT_TOOLKIT=XToolkit -export _JAVA_AWT_WM_NONREPARENTING=1 -if [ -x `whence less` ] ; then - export PAGER==less -else - export PAGER==more -fi -if [ -z "$PERL5LIB" ] ; then - # If PERL5LIB wasn't previously defined, set it... - export PERL5LIB=~/local/lib/perl5:~/local/lib/perl5/site_perl -else - # ...otherwise, extend it. - export PERL5LIB=$PERL5LIB:~/local/lib/perl5:~/local/lib/perl5/site_perl -fi - -## Set up vim aliases -if whence vim > /dev/null ; then - VIM=vim - if whence mvim > /dev/null ; then - #VIM=mvim - VIM="mvim -c 'au VimLeave * maca hide:'" - fi -else - VIM=vi -fi -export VISUAL="$VIM -f" -export EDITOR="$VIM -f" -alias v=$VIM -alias vh="mvim -c 'au VimLeave * maca hide:'" -alias vi=$VIM -alias vr="$VIM --remote-tab" -alias vl="$VIM --serverlist" -vs() { $VIM --servername $1 --remote-tab $argv[2,$] } -alias vd=${VIM}diff -alias vir=vr -alias vis=vs -alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'" - -## For forwarding ssh auth I think -if [ -n "$SSH_AUTH_SOCK" ] ; then - ln -fs $SSH_AUTH_SOCK $HOME/.ssh-agent -fi - -## Add extra fonts -#xset fp+ /usr/APL2/fonts/X11 -#xset fp rehash - -## Set up ruby gems for $RUBYLIB -#if [ -d $HOME/.gems/gems ] ; then -# for rlib in $HOME/.gems/gems/*/lib ; do -# export RUBYLIB=$RUBYLIB:$rlib -# done -#fi -#for rubylib in /usr/lib/ruby/gems/1.8/gems/*/lib ; do -# export RUBYLIB=$RUBYLIB:$rubylib -#done - -# Aliases -alias ls="ls -F" -alias l="ls -F" -alias ll="l -Fl" -alias la="l -Fa" -alias lla="ll -Fa" -alias c="cd" -cl() { cd $@ && ls } -alias e="TERM=rxvt-256color; emacs -nw" -alias et="TERM=rxvt-256color; emacsclient -t" -alias ec="emacsclient -c --eval '(set-background-color \"black\")'" -alias ecx="emacsclient --eval '(make-frame-on-display \"$DISPLAY\")'" -#alias s="TERM=xterm;ssh serenity.cat.pdx.edu" -alias s="TERM=rxvt;ssh hunner@serenity.cat.pdx.edu" -alias f="TERM=rxvt;ssh hunner@firefly.cat.pdx.edu" -alias z="TERM=rxvt;ssh hunner@zabava.cat.pdx.edu" -alias o="TERM=rxvt;ssh hunner@osiris.cat.pdx.edu" -alias m="TERM=rxvt;ssh hunner@mint.cic.pdx.edu" -alias chandra="TERM=rxvt;ssh hunner@chandra.cs.pdx.edu" -export CS=cs.pdx.edu -alias odin="TERM=xterm;ssh hunner@odin.pdx.edu" -alias budda="ssh hunnur@budda.dreamhost.com" -alias kvar="ssh hunner@131.252.134.134" -alias kvin="ssh hunner@131.252.135.22" -alias mutt="TERM=xterm-256color mutt" -alias x="exit" -alias gpg-add="/usr/libexec/gpg-preset-passphrase" -alias rsync="rsync -azPHe ssh" #-a equals -rlptgoD -alias mang="cd ~/zips/mangband ; DISPLAY=\"\" ./mangclient" -alias nh="export HISTFILE=/dev/null" -#alias cl="co -l" -alias cu="ci -u" -alias sl="screen -ls" -alias sr="screen -r" -alias sx="screen -x" -alias srd="screen -rd" -alias t="TERM=xterm-256color tmux at" -alias tl="tmux ls" -alias bc="bc -q" -alias fm="fmstatus.sh&;shell-fm" -alias apl="gvim -font 'APL385 Unicode 14' -c 'set keymap=uniapl385'" -alias d="dtach -a ~/.dtach" -alias eo="xmodmap ~/keymaps/eo_dv_hunner.pke" -alias vt="export TERM=vt220" -alias rm=rm; unalias rm #hack -alias g="git" -alias gl="git lg" -alias gp="git push" -alias gu="git pull" -alias gs="git status" -alias gm="git mv" -alias gr="git rm" -alias ga="git add" -alias gaf="git add --force" -alias gb="git branch" -alias gc="git commit" -alias gca="git commit --amend" -alias gd="git diff" -alias gdw="git diff --color-words" -alias gdt="git difftool" -alias go="git checkout" -alias gob="git checkout -b" -alias gk="gitk --all&" -alias gx="gitx --all" -alias uzbl="uzbl-browser" -alias hide="SetFile -a V" -alias show="SetFile -a v" -#startup aliases -alias -s pdf="zathura" -alias -s txt="vi" -alias -s flv="mplayer" -alias -s avi="mplayer" -alias -s mkv="mplayer" -alias -s mpg="mplayer" - -# Functions -args() { echo $#; } -title() { WINTITLE="$*"; print -Pn "\e]0;$WINTITLE\a" } -#if [ x$WINDOW != x ]; then -# # Running under screen(1) -# precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [%~]\a" || : } -# preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [$1]\a" || : } -#else -# precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [%~]\a" || : } -# preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : } -#fi -if [ x$DISPLAY != x ] ; then - precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [%~]\a" || : } - preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : } -fi -alias resize="printf '\33]50;%s%d\007' 'xft:Terminus:pixelsize=' $1" # ':antialias=true'" -alias asdf="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY" -alias auie="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY" -alias aoeu='setxkbmap us' -alias bepo='setxkbmap fr bepo "ctrl:swapcaps"' -if [ -f $HOME/.termcap ] ; then - TERMCAP=$(< $HOME/.termcap) - export TERMCAP -fi -make_termcap() { - cat > $HOME/.termcap << EOF -rxvt-256color|rxvt-256color terminal (X Window System):\ - :Co#256:\ - :tc=rxvt-unicode:\ - :tc=rxvt: -EOF -} -type7() { - if [ `uname -s` = "SunOS" ] ; then - xmodmap ~/keymaps/eo_dv_hunner_type7_sol.pke - else - xmodmap ~/keymaps/nu_type7.pke - fi -} -zpush() { - for host in $zshhosts ; do - files=(.zshrc .vim .vimrc) - if [ x$(hostname) = x$host ] ; then - continue - fi - if [ $(uname) = "Linux" ] ; then - ping -c1 -W1 ${host#*@} > /dev/null - else - ping -c1 -t1 ${host#*@} > /dev/null - fi - if [ $status -eq 0 ] ; then - echo -n "$host: copying" - for file in $files ; do - echo -n . - if ! rsync -azPH $file $host:~ > /dev/null ; then continue 2 ; fi - done - echo "done" - #rsync .zshenv $host:~ > /dev/null - else - echo "$host: unpings" - fi - done; -} -function r() { - if [[ -n $TMUX ]]; then - NEW_SSH_AUTH_SOCK=`tmux showenv|grep ^SSH_AUTH_SOCK|cut -d = -f 2` - if [[ -n $NEW_SSH_AUTH_SOCK ]] && [[ -S $NEW_SSH_AUTH_SOCK ]]; then - SSH_AUTH_SOCK=$NEW_SSH_AUTH_SOCK - fi - fi -} -ex () { - if whence gtar > /dev/null ; then - TAR=gtar - else - TAR=tar - fi - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) $TAR xvjf $1 ;; - *.tar.gz) $TAR xvzf $1 ;; - *.tar.xz) $TAR xvJf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; - *.gz) gunzip $1 ;; - *.xz) unxz $1 ;; - *.tar) $TAR xvf $1 ;; - *.tbz2) $TAR xvjf $1 ;; - *.tbz) $TAR xvjf $1 ;; - *.tgz) $TAR xvzf $1 ;; - *.txz) $TAR xvJf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1 ;; - *.7z) 7z x $1 ;; - *) echo "don't know how to extract '$1'..." ;; - esac - else - echo "'$1' is not a valid file!" - fi -} - -## Profiling options -#unsetopt xtrace -#exec 2>&3 3>&-