Mercurial > index.cgi > dotfiles

changeset 198:6e7913283c7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed a lot of cruft that's no longer needed, cleaned up some comments & syntax
author Steve Huston <huston@srhuston.net>
date Wed, 30 Sep 2020 11:21:14 -0400
parents 954d25f20123
children 6bfec0d0d020
files .bash_aliases .bash_logout .bash_profile .bashrc .rpmmacros .screenrc.pbstops .vimrc
diffstat 7 files changed, 23 insertions(+), 411 deletions(-) [+]
line wrap: on
line diff
--- a/.bash_aliases	Wed Sep 30 10:54:00 2020 -0400
+++ b/.bash_aliases	Wed Sep 30 11:21:14 2020 -0400
@@ -1,5 +1,3 @@
-# $Id$
-
 # Aliases are read from this file; no real reason to separate them out except
 # for readability.
 
@@ -48,28 +46,8 @@
 
 # SSH aliases
 alias bh='ssh csesbh2.princeton.edu'
-alias dh='ssh srhuston.net'
-alias j='ssh joshua.srhuston.net'
-alias keys='ssh-add $HOME/.ssh/*.pvt'
-alias r='ssh -l root'
-alias rf='ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null -l root'
-alias rbh='ssh -t csesbh2.princeton.edu screen -raAx csesbh2'
-alias rj='ssh -t joshua.srhuston.net screen -raAx'
-alias rx='ssh -t xanadu.astro.princeton.edu screen -raAx'
-alias roc='ssh zenoss@rocinante'
-alias s=ssh
-alias sf='ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null'
-t() {
-  T_HOST=xanadu.astro.princeton.edu
-  if [ -n "$2" ] ; then
-    T_HOST=$2
-  fi
-  ssh -t $T_HOST "ssh $1"
-}
-alias x='ssh xanadu.astro.princeton.edu'
-
-# SSH key signing with Vault for administration
 cert() {
+  # SSH key signing with Vault for administration
   export VAULT_ADDR='https://ajax.rc.princeton.edu:8200'
   ssh-add -d $HOME/.ssh/rc_vault_key-cert.pub > /dev/null 2>&1
   if vault login -method=radius username=vi-srh; then
@@ -79,6 +57,28 @@
     echo Failed to login to vault, aborting
   fi
 }
+alias dh='ssh srhuston.net'
+alias j='ssh joshua.srhuston.net'
+alias keys='ssh-add $HOME/.ssh/*.pvt'
+alias r='ssh -l root'
+alias rf='ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null -l root'
+alias rbh='ssh -t csesbh2.princeton.edu screen -raAx csesbh2'
+alias rj='ssh -t joshua.srhuston.net screen -raAx'
+alias rx='ssh -t xanadu.astro.princeton.edu screen -raAx'
+alias s=ssh
+alias sf='ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null'
+t() {
+  # Tunneling SSH - a simple 't hostname' will tunnel to xanadu and then
+  # connect to hostname, while 't hostname tunnelhost' will connect to
+  # tunnelhost and then hostname
+  T_HOST=xanadu.astro.princeton.edu
+  if [ -n "$2" ] ; then
+    T_HOST=$2
+  fi
+  ssh -t $T_HOST "ssh $1"
+}
+alias x='ssh xanadu.astro.princeton.edu'
+
 
 # Proxying/tunneling - predominantly for my Mac laptop
 proxy() {
@@ -95,11 +95,6 @@
 
 # Remote desktop/VNC
 eval "alias milton='ssh -L9930:milton:5900 -f joshua.srhuston.net \"sleep 5\"; ${VNCVIEWER}localhost:9930 &'"
-# Xanadu VMs
-eval "alias xvm='ssh -L9909:localhost:5909 -f xanadu.astro.princeton.edu \"sleep 300\"; ${VNCVIEWER}localhost:9909 &'"
-eval "alias cygnus='ssh -L9910:localhost:5910 -f xanadu.astro.princeton.edu \"sleep 300\"; ${VNCVIEWER}localhost:9910 &'"
-eval "alias syrinx='ssh -L9911:localhost:5911 -f xanadu.astro.princeton.edu \"sleep 300\"; ${VNCVIEWER}localhost:9911 &'"
-eval "alias lyra='ssh -L9912:localhost:5912 -f xanadu.astro.princeton.edu \"sleep 300\"; ${VNCVIEWER}localhost:9912 &'"
 
 # Programs
 alias atari='atari800 -height 800 -width 600'
@@ -108,7 +103,6 @@
 alias pine='alpine'
 alias ret='screen -raAx'
 alias rot13="tr 'a-zA-Z' 'n-za-mN-ZA-M'"
-alias tops='unset STY; screen -c .screenrc.pbstops -S pbstop'
 tt () {
   OPTS="-G"
   if [ -e ${HOME}/.tt/${1}.tin ] ; then
@@ -131,7 +125,6 @@
 # LDAP/host tools
 alias ldm="ldapmodify -Q -Y GSSAPI -c"
 alias ldsloop='while true; do read; clear; lds "$REPLY"; done'
-alias hostmaster='ssh -x -a huston@arizona.princeton.edu /usr/oit/bin/hostinfo'
 
 lds () {
   QUERY="$1"
@@ -144,26 +137,6 @@
   ldapsearch -Q -Y GSSAPI -LLL $OPTS "($QUERY)" $@
 }
 
-ldsauth () {
-  QUERY="$1"
-  shift
-  OPTS=""
-  [[ "$1" =~ ^- ]] && {
-    OPTS="$1"
-    shift
-  }
-  ldapsearch -LLL -Z -W -D cn=DrAdmin,dc=astro,dc=princeton,dc=edu $OPTS -x "($QUERY)" $@
-}
-
-ldapsync() {
-  for H in ldap ldap2 ldap3 ; do
-    echo -ne $H":\t"
-    ldapsearch -LLL -h $H.astro.princeton.edu -x -s base '(objectclass=*)' contextCSN | egrep -v '^($|dn)' | sed 's/contextCSN: //'
-  done
-  echo -ne "now:\t"
-  date -u +%Y%m%d%H%M%S
-}
-
 # Other
 alias condor_check="ls -lat /u/condor/hosts/*/log/MasterLog"
 alias slurp="wget -r -l1 -np -nd -A.mp3"
@@ -179,17 +152,6 @@
   popd
 }
 
-tock() {
-  while true ; do
-    if [ `date +%S` -gt 42 ] ; then
-      if [ `date +%S` -lt 47 ] ; then
-        afplay /System/Library/Sounds/Pop.aiff &
-      fi
-    fi
-    sleep 1
-  done > /dev/null 2>&1
-}
-
 TOhtml() {
   OUTDIR=`mktemp -d TOHTML.XXXXXX`
   for F in `hg locate` ; do 
--- a/.bash_logout	Wed Sep 30 10:54:00 2020 -0400
+++ b/.bash_logout	Wed Sep 30 11:21:14 2020 -0400
@@ -1,5 +1,3 @@
-# $Id$
-#
 #if [ "$SSH_AGENT_PID" -a "$SHLVL" = "1" ] ; then
 #  eval `/usr/bin/ssh-agent -k`
 #fi
--- a/.bash_profile	Wed Sep 30 10:54:00 2020 -0400
+++ b/.bash_profile	Wed Sep 30 11:21:14 2020 -0400
@@ -1,5 +1,3 @@
-# $Id$
-#
 # This file is sourced for interactive login shells, or
 # non-interactive shells with the --login option.  So things which you
 # want to happen only on login shells should go here.
--- a/.bashrc	Wed Sep 30 10:54:00 2020 -0400
+++ b/.bashrc	Wed Sep 30 11:21:14 2020 -0400
@@ -1,5 +1,3 @@
-# $Id$
-#
 # This file is sourced for shells which are interactive but not a
 # login shell; however, since it is also sourced within
 # $HOME/.bash_profile, the end result is that this file is sourced for all
@@ -102,39 +100,6 @@
   fi
 done
 
-# Local Perl install
-if [ -d $HOME/perl ]; then
-  if [ -d $HOME/perl/lib/perl5 ]; then
-    [[ $PERL5LIB =~ (^|:)$HOME/perl/lib/perl5($|:) ]] || \
-    export PERL5LIB=$HOME/perl/lib/perl5${PERL5LIB:+:$PERL5LIB}
-  fi
-
-  if [ -d $HOME/perl/lib64/perl5 ]; then
-    [[ $PERL5LIB =~ (^|:)$HOME/perl/lib64/perl5($|:) ]] || \
-    export PERL5LIB=$HOME/perl/lib64/perl5${PERL5LIB:+:$PERL5LIB}
-  fi
-
-  if [ -d $HOME/perl/lib/perl5/site_perl ]; then
-    [[ $PERL5LIB =~ (^|:)$HOME/perl/lib/perl5/site_perl($|:) ]] || \
-    export PERL5LIB=$HOME/perl/lib/perl5/site_perl${PERL5LIB:+:$PERL5LIB}
-  fi
-
-  if [ -d $HOME/perl/lib64/perl5/site_perl ]; then
-    [[ $PERL5LIB =~ (^|:)$HOME/perl/lib64/perl5/site_perl($|:) ]] || \
-    export PERL5LIB=$HOME/perl/lib64/perl5/site_perl${PERL5LIB:+:$PERL5LIB}
-  fi
-
-  if [ -d $HOME/perl/share/man ]; then
-    [[ $MANPATH =~ (^|:)$HOME/perl/share/man($|:) ]] || \
-    export MANPATH=$HOME/perl/share/man:${MANPATH:+$MANPATH}
-  fi
-
-  if [ -d $HOME/perl/bin ]; then
-    [[ $PATH =~ (^|:)$HOME/perl/bin($|:) ]] || \
-    export PATH=$HOME/perl/bin${PATH:+:$PATH}
-  fi
-fi
-
 # Local install paths - install things to $HOME/Installs directories, and
 # they will automatically get the proper paths added.  Most things
 # that use autoconf will do this with
@@ -156,33 +121,6 @@
   fi
 done
 
-## Add-ons for Intel compilers at work, and Condor
-#INTEL_ARCH=''
-#case `uname -p` in
-#  i[3456]86)
-#    INTEL_ARCH="ia32"
-#    ;;
-#
-#  x86_64)
-#    INTEL_ARCH="intel64"
-#    ;;
-#esac
-#[[ "$INTEL_ARCH" ]] && {
-#  [[ $PATH =~ (^|:)/usr/peyton/intel ]] || {
-#    [[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \
-#     . /usr/peyton/intel/11.0/bin/iccvars.sh $INTEL_ARCH
-#    [[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \
-#     . /usr/peyton/intel/11.0/bin/ifortvars.sh $INTEL_ARCH
-#  }
-#}
-
-#if [ -f /u/condor/condor-setup.sh ]; then
-#  [[ $PATH =~ (^|:)/u/condor/hosts/`hostname -s`/sbin($|:) ]] || {
-#    export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin
-#    . /u/condor/condor-setup.sh
-#  }
-#fi
-
 # Now make sure $HOME/bin is top of the list (or at least present)
 if [ -d $HOME/bin ]; then
   [[ $PATH =~ (^|:)$HOME/bin($|:) ]] || \
--- a/.rpmmacros	Wed Sep 30 10:54:00 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# $Id$
-#
-%_topdir /u/huston/rpmbuild/
--- a/.screenrc.pbstops	Wed Sep 30 10:54:00 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,279 +0,0 @@
-# $Id$
-
-vbell off
-bell_msg "^GBell in window %n"
-defnonblock 5
-nethack on
-hardstatus string "%{+b .bw}%-Lw%{+b .rw}%50L>%n%f* %t%?%{+b .cw}(%u)%{-}%?%{-}%+Lw%L< %-20=%{+b ..g} %H%-8= %{+b ..y} %c " 
-hardstatus alwayslastline
-activity "^GActivity in window %n"
-zombie qr
-screen -t orbital 0 ssh -t orbital slurmtop
-screen -t adroit 1 ssh -t adroit slurmtop
-screen -t della 2 ssh -t della4 slurmtop
-screen -t hecate 3 ssh -t hecate slurmtop
-screen -t tiger 4 ssh -t tiger slurmtop
-screen -t mcmillan 5 ssh -t mcmillan slurmtop
-screen -t tukey 6 ssh -t tukey slurmtop
-screen -t perseus 7 ssh -t perseus slurmtop
-
-# The following from the /etc/screenrc that came with screen-4.0.3-1.el5_4.1
-# with a few lines commented out so they don't interfere with the above.  One
-# note, the 'deflogin' setting causes a complaint on Macs because they don't
-# use it; but it's only when one starts a screen, and only for a second or
-# two.
-
-#
-# This is an example for the global screenrc file.
-# You may want to install this file as /usr/local/etc/screenrc.
-# Check config.h for the exact location.
-#
-# Flaws of termcap and standard settings are done here.
-#
-
-#startup_message off
-
-#defflow on # will force screen to process ^S/^Q
-
-deflogin on
-#autodetach off
-
-#vbell on
-#vbell_msg "   Wuff  ----  Wuff!!  "
-
-# all termcap entries are now duplicated as terminfo entries.
-# only difference should be the slightly modified syntax, and check for
-# terminfo entries, that are already corected in the database.
-# 
-# G0 	we have a SEMI-GRAPHICS-CHARACTER-MODE
-# WS	this sequence resizes our window.
-# cs    this sequence changes the scrollregion
-# hs@	we have no hardware statusline. screen will only believe that
-#       there is a hardware status line if hs,ts,fs,ds are all set.
-# ts    to statusline
-# fs    from statusline
-# ds    delete statusline
-# al    add one line
-# AL    add multiple lines
-# dl    delete one line
-# DL    delete multiple lines
-# ic    insert one char (space)
-# IC    insert multiple chars
-# nx    terminal uses xon/xoff
-
-termcap  facit|vt100|xterm LP:G0
-terminfo facit|vt100|xterm LP:G0
-
-#the vt100 description does not mention "dl". *sigh*
-termcap  vt100 dl=5\E[M
-terminfo vt100 dl=5\E[M
-
-#facit's "al" / "dl"  are buggy if the current / last line
-#contain attributes...
-termcap  facit al=\E[L\E[K:AL@:dl@:DL@:cs=\E[%i%d;%dr:ic@
-terminfo facit al=\E[L\E[K:AL@:dl@:DL@:cs=\E[%i%p1%d;%p2%dr:ic@
-
-#make sun termcap/info better
-termcap  sun 'up=^K:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:IC=\E[%d@:WS=1000\E[8;%d;%dt'
-terminfo sun 'up=^K:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC:IC=\E[%p1%d@:WS=\E[8;%p1%d;%p2%dt$<1000>'
-
-#xterm understands both im/ic and doesn't have a status line.
-#Note: Do not specify im and ic in the real termcap/info file as
-#some programs (e.g. vi) will (no,no, may (jw)) not work anymore.
-termcap  xterm|fptwist hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
-terminfo xterm|fptwist hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
-
-# Long time I had this in my private screenrc file. But many people
-# seem to want it (jw):
-# we do not want the width to change to 80 characters on startup:
-# on suns, /etc/termcap has :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l:
-termcap xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
-terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
-
-#
-# Do not use xterms alternate window buffer. 
-# This one would not add lines to the scrollback buffer.
-#termcap xterm|xterms|xs ti=\E7\E[?47l
-#terminfo xterm|xterms|xs ti=\E7\E[?47l
-
-#make hp700 termcap/info better
-termcap  hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@'
-terminfo hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@'
-
-#wyse-75-42 must have defflow control (xo = "terminal uses xon/xoff")
-#(nowadays: nx = padding doesn't work, have to use xon/off)
-#essential to have it here, as this is a slow terminal.
-termcap wy75-42 nx:xo:Z0=\E[?3h\E[31h:Z1=\E[?3l\E[31h
-terminfo wy75-42 nx:xo:Z0=\E[?3h\E[31h:Z1=\E[?3l\E[31h
-
-#remove some stupid / dangerous key bindings
-bind ^x
-bind x
-bind ^k
-#bind L
-bind ^\
-#make them better
-bind \\ quit
-bind K kill
-#bind I login on
-#bind O login off
-bind } history
-bind X lockscreen
-#
-# Example of a user's .screenrc file
-#
-
-# This is how one can set a reattach password:
-# password ODSJQf.4IJN7E    # "1234"
-
-# no annoying audible bell, please
-#vbell on
-
-# detach on hangup
-autodetach on
-
-# don't display the copyright page
-startup_message off
-
-# emulate .logout message
-pow_detach_msg "Screen session of $LOGNAME $:cr:$:nl:ended."
-
-# advertise hardstatus support to $TERMCAP
-# termcapinfo  * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\'
-
-# make the shell in every window a login shell
-#shell -$SHELL
-
-# autoaka testing
-# shellaka '> |tcsh'
-# shellaka '$ |sh'
-
-# set every new windows hardstatus line to somenthing descriptive
-# defhstatus "screen: ^En (^Et)"
-
-defscrollback 1000
-
-# don't kill window after the process died
-# zombie "^["
-
-# enable support for the "alternate screen" capability in all windows
-# altscreen on
-
-################
-#
-# xterm tweaks
-#
-
-#xterm understands both im/ic and doesn't have a status line.
-#Note: Do not specify im and ic in the real termcap/info file as
-#some programs (e.g. vi) will not work anymore.
-termcap  xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
-terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
-
-#80/132 column switching must be enabled for ^AW to work
-#change init sequence to not switch width
-termcapinfo  xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
-
-# Make the output buffer large for (fast) xterms.
-#termcapinfo xterm* OL=10000
-termcapinfo xterm* OL=100
-
-# tell screen that xterm can switch to dark background and has function
-# keys.
-termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l'
-termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
-termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
-
-# special xterm hardstatus: use the window title.
-termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
-
-#terminfo xterm 'vb=\E[?5h$<200/>\E[?5l'
-termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
-
-# emulate part of the 'K' charset
-termcapinfo   xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337'
-
-# xterm-52 tweaks:
-# - uses background color for delete operations
-termcapinfo xterm* be
-
-################
-#
-# wyse terminals
-#
-
-#wyse-75-42 must have flow control (xo = "terminal uses xon/xoff")
-#essential to have it here, as this is a slow terminal.
-termcapinfo wy75-42 xo:hs@
-
-# New termcap sequences for cursor application mode.
-termcapinfo wy* CS=\E[?1h:CE=\E[?1l:vi=\E[?25l:ve=\E[?25h:VR=\E[?5h:VN=\E[?5l:cb=\E[1K:CD=\E[1J
-
-################
-#
-# other terminals
-#
-
-# make hp700 termcap/info better
-termcapinfo  hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@'
-
-# Extend the vt100 desciption by some sequences.
-termcap  vt100* ms:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC
-terminfo vt100* ms:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC
-termcapinfo linux C8
-# old rxvt versions also need this
-# termcapinfo rxvt C8
-
-
-################
-#
-# keybindings
-#
-
-#remove some stupid / dangerous key bindings
-bind k
-bind ^k
-bind .
-bind ^\
-bind \\
-bind ^h
-bind h
-#make them better
-bind 'K' kill
-#bind 'I' login on
-#bind 'O' login off
-bind '}' history
-
-# Yet another hack:
-# Prepend/append register [/] to the paste if ^a^] is pressed.
-# This lets me have autoindent mode in vi.
-#register [ "\033:se noai\015a"
-#register ] "\033:se ai\015a"
-#bind ^] paste [.]
-
-################
-#
-# default windows
-#
-
-# screen -t local 0
-# screen -t mail 1 mutt
-# screen -t 40 2 rlogin server
-
-# caption always "%3n %t%? @%u%?%? [%h]%?%=%c"
-## alternative caption, gives window list, LOGNAME and current date:
-# caption always "%{wk}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw %=%{mk}@%H %{yk}%D %{ck}%M%{wk} %{ck}%d %{gk}%c"
-# hardstatus alwaysignore
-# hardstatus alwayslastline "%Lw"
-
-# Red Hat's normal status line
-#hardstatus string "[screen %n%?: %t%?] %h"
-
-# bind = resize =
-# bind + resize +1
-# bind - resize -1
-# bind _ resize max
-#
-# defnonblock 1
-# blankerprg rain -d 100
-# idle 30 blanker
--- a/.vimrc	Wed Sep 30 10:54:00 2020 -0400
+++ b/.vimrc	Wed Sep 30 11:21:14 2020 -0400
@@ -1,5 +1,3 @@
-" $Id$
-
 version 5.0
 set nocompatible
 set autoindent