From: ian Date: Wed, 3 Sep 2003 23:09:27 +0000 (+0000) Subject: updates from ian@chiark X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=f0ed10113081dd439197f63d53ae0c05e996ef03;p=ian-dotfiles.git updates from ian@chiark --- diff --git a/config b/config index eaaeb82..d618aba 100644 --- a/config +++ b/config @@ -43,5 +43,7 @@ $ncipher= $hostname =~ m/\.(ncipher\.com$)/ ? 'cam' : $hostname =~ m/\.(ncipherusa\.com$)/ ? 'bos' : 0; +$chiark= $hostname =~ m/chiark/; + %ncipherdom= ('cam' => 'ncipher.com', 'bos' => 'ncipherusa.com'); diff --git a/files/_.bashrc b/files/_.bashrc index e61c90a..6f136db 100644 --- a/files/_.bashrc +++ b/files/_.bashrc @@ -5,41 +5,22 @@ hostname_completion_file=~/.hosts export PWD # My own functions -ls() { /bin/ls -FC "$@" ; } -ll() { /bin/ls -FClag "$@" ; } +ls() { /bin/ls -FC "$@"; } +ll() { /bin/ls -FClag "$@"; } setprompt() { PS1=`autotitle`; export PS1; } rs() { eval `/usr/openwin/bin/resize` ; setprompt ; } cd() { builtin cd "$@"; setprompt; } pu() { builtin pushd "$@"; setprompt; } po() { builtin popd "$@"; setprompt; } -# newgrp() { -# NEWGRPSHELL="${LOGINSHELL:-}"; export NEWGRPSHELL -# exec /bin/newgrp $* -# } - -setenv () { - varname=`echo $1 | tr '[a-z]' '[A-Z]'` - eval "$varname=\"$2\"" ; export $varname ; -} - -# if [ "${NEWGRPSHELL:-}" ] -# then -# unset NEWGRPSHELL -# LOGINSHELL=true -# fi - # Set up history and prompt if [ "$PS1" ] then HISTFILE=$HOME/.history/$HOST~$$~ - AUTOTITLE_STDOUT="${LOGINSHELL:+-}%?u%U%!%?g(%G)%!%?u@%!%h:%d1~.> " + AUTOTITLE_STDOUT="@@? + $chiark && $username eq 'ian' ?@@-@@;%?u%U%!%?g(%G)%!%?u@%!%h:%d1~.> " AUTOTITLE_WINDOW="%h - %d~. %Y.[U..[M..[D./..%X.L]..M]..R]./.. %U%?G(%G)%!" AUTOTITLE_ICON="%h: %d3~. %Y.[U..[M..[D./..%X.L]..M]..R]./.." export AUTOTITLE_STDOUT AUTOTITLE_WINDOW AUTOTITLE_ICON setprompt fi - -# Set up the terminal: -# stty new intr '^c' erase '^?' kill '^x' susp '^z' dsusp '^y' eof '^d' \ -# hupcl ixon ixoff -tostop quit '^\' 2>/dev/null diff --git a/files/_.configs_Xresources b/files/_.configs_Xresources index b250b01..4dbf5b5 100644 --- a/files/_.configs_Xresources +++ b/files/_.configs_Xresources @@ -6,6 +6,13 @@ epoch.nonlocal.minibuf: false xv*geometry: +10+10 +wish*foreground: grey90 +wish*background: grey25 +wish*activeForeground: white +wish*activeBackground: grey35 +wish*disabledForeground: black +wish*disabledBackground: grey25 + povray*geometry: +40+10 povray*background: black povray*foreground: black diff --git a/files/_.configs_setenvir b/files/_.configs_setenvir index 9ee8688..33c1f29 100755 --- a/files/_.configs_setenvir +++ b/files/_.configs_setenvir @@ -2,31 +2,52 @@ # Set up the environment: PATH=$HOME/personal/@@$platform@@/bin:$HOME/personal/scripts/bin -@@?$ncipher?@@@@# + +@@?$ncipher?@@ PATH=$PATH:$HOME/personal/crypto/scripts -@@;@@# -@@? -d '/opt/bin' ?@@@@# +@@; + +@@? -d '/opt/bin' ?@@ PATH=$PATH:/opt/bin -@@;@@# -@@? $uname eq 'HP-UX' ?@@@@# +@@; + +@@? $uname eq 'HP-UX' ?@@ PATH=$PATH:/usr/contrib/bin -@@;@@# +@@; + PATH=$PATH:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin -@@? $uname eq 'SunOS' ?@@@@# + +@@? $uname eq 'SunOS' ?@@ PATH=$PATH:/usr/ccs/bin -@@;@@# -@@? $uname eq 'AIX' ?@@@@# +@@; + +@@? $uname eq 'AIX' ?@@ PATH=$PATH:/usr/vac/bin -@@;@@# +@@; + PATH=$PATH:@@$xbindir@@ export PATH CDPATH=:..:$HOME:$HOME/things CVS_RSH=ssh + +unset MAILPATH + +@@?$ncipher?@@ CVSROOT=:ext:cvs:/ncipher/local-CVS +@@; + +@@?$chiark?@@ +CVSROOT=/usr/src/CVS +NNTPAUTH="md5cookie1way ian" +MAILPATH=/var/spool/mail/@@$username@@:$HOME/mail/SINBOX.DROP +ORGANIZATION="Linux Unlimited" + +export MAILPATH NNTPAUTH ORGANISATION +@@; + EDITOR=emacs -ESHELL=/usr/bin/bash HISTORY=256 HOST=`hostname` LANG=C @@ -48,7 +69,6 @@ NC_SITES=@@$ncipher@@:@@ $ncipher eq 'bos' ? 'cam' : 'bos' @@ export NC_SITES @@; -unset MAILPATH unset ignoreeof umask 002 diff --git a/files/_.configs_x11start b/files/_.configs_x11start index 3e25903..00fc4b2 100755 --- a/files/_.configs_x11start +++ b/files/_.configs_x11start @@ -1,43 +1,34 @@ -#!/bin/bash +#!/bin/sh eval `.configs/configure` >".counters/v.$DISPLAY" -# if [ $xauth = true ] -# then -# nice -15 sh -c ' -# xhost | perl -ne "s//xhost\t-/; print unless m/ /;" | sh 2>&1 \ -# | perl -pe "s/^\S+ being removed from access control list\s+\$/-/"; -# xhost - -# ' & -# fi - echo -n 'starting clients ' +# xsetroot -fg '#883030' -bg '#204050' -bitmap bitmap/root +# xsetroot -cursor bitmap/circle bitmap/circle-inv -fg white -bg black +# xset b 75 300 +#if [ "x$1" != "xnotwm" ]; then +# echo -n . ; twm & +#fi +#echo -n . ; xload & +#echo -n . ; xterm -n 'xterm d' -T xterm -geometry 80x25+0-10 & +#echo -n . ; emacs -f make-session & +#echo -n . ; unclutter -noevents & +#echo -n . ; xbiff -name xbiffs & xbiff & xbiff -name xbiff2 & +#echo -n . ; stty -isig +#echo -n . ; (while cat /dev/xconsole; do sleep 10; done) & sleep 1 +#really start-stop-daemon --stop --exec /usr/bin/X11/xconsole --user root --quie +# +#echo . ; exec xclock + echo -n . sh .configs/x11start-colours=$colours echo -n . -# if [ "x$chost" = x ] -# then -# .configs/xclients & -# $echo -n . -# if [ "x$HOST" != xleek ] -# then -# xrsh leek /usr/bin/X11/xload -geometry 120x120+34+0 & -# fi -# else -# $brokenserver && xhost +$chost +quince -# cat .configs/setenvir - .configs/xclients < " vm-confirm-quit 1 @@ -341,7 +343,7 @@ then call send-and-exit." vm-frame-per-folder nil vm-tale-is-an-idiot t vm-primary-inbox (concat vm-folder-directory "INBOX") - vm-sysadmin-inbox (concat vm-folder-directory "SINBOX") + vm-sinbin-inbox (concat vm-folder-directory "SINBOX") vm-uninteresting-senders "ian" vm-reply-ignored-addresses (make-regexps-ignore-non-address @@ -358,7 +360,20 @@ then call send-and-exit." "iwj10@cam.ac.uk" "Ian.Jackson@cl.cam.ac.uk")) mail-archive-file-name "~/mail/Outbound" -@@?$ncipher?@@@@# +@@?!$ncipher?@@ + vm-spool-files + '((vm-primary-inbox "/var/spool/mail/@@$username@@" + "~/mail/INBOX.CRASH") + (vm-primary-inbox "~/News/r" "~/mail/INBOX.CRASH") + (vm-primary-inbox "~/mbox" "~/mail/INBOX.CRASH") + (vm-primary-inbox "~/mail/Outbound" "~/mail/INBOX.CRASH") + (vm-primary-inbox "~/mail/Import" "~/mail/INBOX.CRASH") + (vm-primary-inbox "~/mail/Record" "~/mail/INBOX.CRASH") + (vm-sinbin-inbox "/var/spool/mail/ian" "~/mail/SINBOX.CRASH")) + vm-startup-with-summary t +@@? $chiark && $username eq 'ian' ?@@ + +@@: vm-spool-files (list "~/mbox" "~/mail/Outbound" @@ -371,7 +386,7 @@ then call send-and-exit." "~/News/r") mail-host-address "ncipher.com" user-mail-address "iwj@ncipher.com" -@@;@@# +@@; ; vm-spool-files ; (list @@ -416,9 +431,13 @@ then call send-and-exit." (setq mail-archive-file-name "~/mail/SOutbound"))))) ; +;(defun vmi () +; (interactive) +; (vm "/u/ijackson/mail/INBOX")) +;; (defun vms () (interactive) - (vm vm-sysadmin-inbox)) + (vm vm-sinbin-inbox)) ; (defun make-session () "Makes this emacs hard to kill by requiring ^X^Cy to kill it diff --git a/files/personal_scripts_bin_xloadt b/files/personal_scripts_bin_xloadt index 53c8e3a..073a19d 100755 --- a/files/personal_scripts_bin_xloadt +++ b/files/personal_scripts_bin_xloadt @@ -5,9 +5,12 @@ xlsclients | egrep \ >/dev/null && exit 0 xload -geometry 120x120+@@ -@hostlist= ($ncipher eq 'bos' ? qw(viking dover pell arrakis) : - $ncipher eq 'cam' ? qw(jura islay dover dounreay marple belgrano greenock) : - qw(davenant anarres lsd)); +@hostlist= +($ncipher eq 'bos' ? qw(viking dover pell arrakis) : + $ncipher eq 'cam' ? qw(jura islay dover dounreay marple belgrano greenock) : + $chiark ? qw(chiark) : + qw(davenant anarres lsd)); + for ($i=0; $i<@hostlist; $i++) { last if $hostlist[$i] eq $nodename; } if ($i>=@hostlist) { print STDERR "!! nodename $nodename not in $ncipher list @hostlist\n"; diff --git a/gpt b/gpt index 6bb3a4e..e4ce91d 100755 --- a/gpt +++ b/gpt @@ -19,8 +19,8 @@ # @@; vA <------------------------------------ # || then # comment || ?@@ -# @@# || -# || included text fragment as +# @@# \/ +# /\ included text fragment as # else || string value code to write out # @@: || (@@ {@@ # || <------------------------------------ diff --git a/perms b/perms index 3301353..17c5658 100644 --- a/perms +++ b/perms @@ -1,7 +1,6 @@ .bash_history 0400 .configs/checkconfig +x -.configs/chiarks +x .configs/configure +x .configs/rxprofile +x .configs/startemacs +x @@ -10,6 +9,13 @@ .configs/xclients +x .configs/xprofile +x .configs/xtools +x + +@@?$ncipher?@@ +.configs/chiarks +x +@@: +.configs/chiarks -- +@@; + personal/scripts/bin/iwjendian +x personal/scripts/bin/remoteshell +x personal/scripts/bin/xloadt +x @@ -27,4 +33,5 @@ private/ 2770 .ssh/authorized_keys 644 bitmap/root -> fischer + . diff --git a/process b/process index 192d964..33ed6ae 100755 --- a/process +++ b/process @@ -43,6 +43,8 @@ for (;;) { last if m/^\.$/; if (m/(.*\S)\s+\-\>\s+(\S.*)/) { $linktargs{$1}= $2; + } elsif (m/^(.*\S)\s+\-\-$/) { + $exclude{$1}= 1; } elsif (m/^(.*\S)\s+(\S+)$/) { ($of,$pe)=($1,$2); $isdir= $of =~ s,/$,,; @@ -120,6 +122,8 @@ while ($if=readdir D) { length $1 eq 1 ? $1 : sprintf '%c', hex $1 /ge; + next if $exclude{$of}; + mkparents($of); $newf= 'new/'.$if; prep_proc('files/'.$if,$newf); diff --git a/showresult b/showresult index ed6e397..4e8d86a 100644 --- a/showresult +++ b/showresult @@ -2,3 +2,4 @@ platform @@$platform@@ nodename @@$nodename@@ hostname @@$hostname@@ ncipher @@$ncipher@@ +chiark @@$chiark@@