From f28d69aaae306165cfcbf224581110745cdf2ce4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Jun 2016 17:56:51 +0100 Subject: [PATCH] Found on mariner (already did .bashrc and .emacs) --- dot/configs/.gitignore | 3 - dot/configs/Xresources | 14 +- dot/configs/Xresources-colours=colour | 15 +- dot/configs/Xresources-colours=mono | 2 - dot/configs/Xresources-font=fixed | 4 +- dot/configs/Xresources-font=larger | 4 +- dot/configs/Xresources-font=puffball | 4 +- dot/configs/Xresources-font=zealot | 6 - dot/configs/cache/mariner%:0 | 2 + dot/configs/cache/mariner%:0.0 | 2 + dot/configs/cache/mariner%localhost:1.0 | 2 + dot/configs/chiarks | 24 ++ dot/configs/list | 7 +- dot/configs/rxprofile-root | 8 - dot/configs/setenvir | 36 ++- dot/configs/unpriv-xauth | 13 -- dot/configs/x11start | 14 +- dot/configs/xbiffs | 8 +- dot/configs/xclients | 14 +- dot/configs/xmodmap-kb=liberator | 26 --- dot/configs/xmodmap-kb=pc | 8 +- dot/configs/xmodmap-kb=zealot | 28 --- dot/configs/xprofile | 6 +- dot/configs/xsession-errors | 280 ++++++++++++++++++++++++ dot/configs/xtools | 3 +- dot/gitconfig | 21 +- dot/gitk | 54 ++--- dot/screenrc | 1 + dot/vtwmrc | 89 ++------ dot/xsession | 4 - home/emacs/ian-x.el | 16 +- home/emacs/ian-x19.el | 6 +- home/emacs/ian.el | 259 +++++++++++++--------- scripts/chrome | 3 + scripts/gistatus | 1 - scripts/iwjendian | 2 + scripts/pdftops-noduplex | 7 - scripts/remoteshell | 91 ++++++++ scripts/xloadt | 6 + scripts/xterm-CT | 24 ++ 40 files changed, 697 insertions(+), 420 deletions(-) delete mode 100644 dot/configs/.gitignore delete mode 100644 dot/configs/Xresources-font=zealot create mode 100644 dot/configs/cache/mariner%:0 create mode 100644 dot/configs/cache/mariner%:0.0 create mode 100644 dot/configs/cache/mariner%localhost:1.0 create mode 100755 dot/configs/chiarks delete mode 100755 dot/configs/rxprofile-root delete mode 100755 dot/configs/unpriv-xauth delete mode 100644 dot/configs/xmodmap-kb=liberator delete mode 100644 dot/configs/xmodmap-kb=zealot create mode 100644 dot/configs/xsession-errors create mode 100755 scripts/chrome create mode 100755 scripts/iwjendian delete mode 100755 scripts/pdftops-noduplex create mode 100755 scripts/remoteshell create mode 100755 scripts/xloadt create mode 100755 scripts/xterm-CT diff --git a/dot/configs/.gitignore b/dot/configs/.gitignore deleted file mode 100644 index 0585887..0000000 --- a/dot/configs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -cache -xsession-errors -mini-desktop-window-id diff --git a/dot/configs/Xresources b/dot/configs/Xresources index c1685b4..5253a7e 100644 --- a/dot/configs/Xresources +++ b/dot/configs/Xresources @@ -68,15 +68,15 @@ xlock.mode: qix xman*verticalList: true xman*topBox: false +xterm*pointerMode: 0 xterm*multiScroll: True -xterm*pointerMode: 0 xterm*saveLines: 512 xterm*scrollBar: TRUE xterm*scrollKey: TRUE xterm*scrollTtyOutput: false xterm*visualBell: False xterm*reverseWrap: TRUE -xterm*metaSendsEscape: TRUE +xterm*metaSendsEscape: TRUE xlbiff*resetSaver: TRUE @@ -108,10 +108,6 @@ Emacs.internalBorder: 1 Emacs.verticalScrollBars: off Emacs.menuBar: off -emacs.font: -misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1 -!-misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1 -!emacs.font: fixed -!Emacs.font: fixed -!emacs19.font: fixed - -xacpi-simple*geometry: 150x50-52-0 +emacs.font: -trad-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1 +Emacs.font: -trad-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1 +emacs19.font: -trad-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1 diff --git a/dot/configs/Xresources-colours=colour b/dot/configs/Xresources-colours=colour index 466ec00..cfb7e9e 100644 --- a/dot/configs/Xresources-colours=colour +++ b/dot/configs/Xresources-colours=colour @@ -24,19 +24,6 @@ nfast-wish8*activeBackground: grey35 nfast-wish8*DisabledForeground: black nfast-wish8*DisabledBackground: grey22 -gnuplot*background: black -gnuplot*textColor: white -gnuplot*borderColor: white -gnuplot*axisColor: white -gnuplot*line1Color: blue -gnuplot*line2Color: green -gnuplot*line3Color: orange -gnuplot*line4Color: magenta -gnuplot*line5Color: cyan -gnuplot*line6Color: sienna -gnuplot*line7Color: red -gnuplot*line8Color: coral - emacs.background: Black emacs.foreground: White emacs.pointerColor: Cyan @@ -55,7 +42,7 @@ xclock*foreground: white xclock*background: black xclock*hands: light blue xclock*hourColor: orange -xclock*minuteColor: blue +xclock*minuteColor: blue xload*highlight: white xload*foreground: light blue diff --git a/dot/configs/Xresources-colours=mono b/dot/configs/Xresources-colours=mono index 76a696a..8504740 100644 --- a/dot/configs/Xresources-colours=mono +++ b/dot/configs/Xresources-colours=mono @@ -36,8 +36,6 @@ xclock*highlight: white xclock*foreground: white xclock*background: black xclock*hands: light blue -xclock*hourColor: orange -xclock*minuteColor: blue xload*background: black xload*highlight: white diff --git a/dot/configs/Xresources-font=fixed b/dot/configs/Xresources-font=fixed index 4419e5e..e02ffc6 100644 --- a/dot/configs/Xresources-font=fixed +++ b/dot/configs/Xresources-font=fixed @@ -1,7 +1,7 @@ -!# Ian Jackson X resources file +!# Ian Jackson's X resources file !# Font specifications for small fonts (fixed by default) -emacs.font: -trad-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1 +#emacs.font: fixed xlock.font: fr-25 diff --git a/dot/configs/Xresources-font=larger b/dot/configs/Xresources-font=larger index 7b04ba2..af75085 100644 --- a/dot/configs/Xresources-font=larger +++ b/dot/configs/Xresources-font=larger @@ -1,9 +1,9 @@ !# Ian Jackson's X Resources file !# Font specifications for larger fonts -*font: -*-fixed-bold-r-normal-*-15-*-*-*-*-*-*-* +#*font: -*-fixed-bold-r-normal-*-15-*-*-*-*-*-*-* -emacs.font: -*-fixed-bold-r-normal-*-15-*-*-*-*-*-*-* +#emacs.font: -*-fixed-bold-r-normal-*-15-*-*-*-*-*-*-* xlock.font: -*-charter-bold-r-*-*-24-*-*-*-*-*-iso8859-* diff --git a/dot/configs/Xresources-font=puffball b/dot/configs/Xresources-font=puffball index cdc6848..f1c9938 100644 --- a/dot/configs/Xresources-font=puffball +++ b/dot/configs/Xresources-font=puffball @@ -1,9 +1,9 @@ !# Ian Jackson's X resources file !# Font specifications for small fonts (fixed by default) -*font: fixed +#*font: fixed -emacs.font: fixed +#emacs.font: fixed xlock.font: fr-25 diff --git a/dot/configs/Xresources-font=zealot b/dot/configs/Xresources-font=zealot deleted file mode 100644 index 9ba900c..0000000 --- a/dot/configs/Xresources-font=zealot +++ /dev/null @@ -1,6 +0,0 @@ -!# Ian Jackson X resources file -!# Font specifications for small fonts (fixed by default) - -*font: -Trad-Fixed-Medium-R-Normal--20-200-75-75-C-100-ISO8859-1 -XTerm*font: -Trad-Fixed-Medium-R-Normal--20-200-75-75-C-100-ISO8859-1 -emacs.font: -Trad-Fixed-Medium-R-Normal--20-200-75-75-C-100-ISO8859-1 diff --git a/dot/configs/cache/mariner%:0 b/dot/configs/cache/mariner%:0 new file mode 100644 index 0000000..0fdd325 --- /dev/null +++ b/dot/configs/cache/mariner%:0 @@ -0,0 +1,2 @@ + xauth=false printer=wind arch=Linux2 + mm_x=423 font=fixed size=normal pixels_x=1600 display=mariner colours=colour bvolume=60 pixels_y=1200 echo=echo mm_y=318 brokenserver=false visual=TrueColor brokenbadges=true mthresh=5 kb=pc maccel=4 depth=24 lxtermopts=-rv host=mariner dpi_x=96 bduration=50 dpi_y=96 keycodes=8-255 bpitch=300 diff --git a/dot/configs/cache/mariner%:0.0 b/dot/configs/cache/mariner%:0.0 new file mode 100644 index 0000000..0fdd325 --- /dev/null +++ b/dot/configs/cache/mariner%:0.0 @@ -0,0 +1,2 @@ + xauth=false printer=wind arch=Linux2 + mm_x=423 font=fixed size=normal pixels_x=1600 display=mariner colours=colour bvolume=60 pixels_y=1200 echo=echo mm_y=318 brokenserver=false visual=TrueColor brokenbadges=true mthresh=5 kb=pc maccel=4 depth=24 lxtermopts=-rv host=mariner dpi_x=96 bduration=50 dpi_y=96 keycodes=8-255 bpitch=300 diff --git a/dot/configs/cache/mariner%localhost:1.0 b/dot/configs/cache/mariner%localhost:1.0 new file mode 100644 index 0000000..c6e4e53 --- /dev/null +++ b/dot/configs/cache/mariner%localhost:1.0 @@ -0,0 +1,2 @@ + xauth=false printer=wind arch=Linux2 + mm_x=317 font=fixed size=normal pixels_x=1200 display=localhost colours=colour bvolume=100 pixels_y=900 echo=echo mm_y=237 brokenserver=false visual=TrueColor brokenbadges=true mthresh=5 kb=pc maccel=4 depth=24 lxtermopts=-rv host=mariner dpi_x=96 bduration=150 dpi_y=96 keycodes=8-255 bpitch=500 diff --git a/dot/configs/chiarks b/dot/configs/chiarks new file mode 100755 index 0000000..14df3d6 --- /dev/null +++ b/dot/configs/chiarks @@ -0,0 +1,24 @@ +#!/bin/sh + +eval `cd $HOME && .configs/configure` + +# ssh -L 6667:chiark:6667 -L 3128:chiark:3128 ijackson@chiark.greenend.org.uk sleep 604800 &2 'usage: .../chiarks [-q]'; exit 1;; +esac + +for x in 3 2 1 +do + sz=80x55 + y=$(( 35*$x+100+$pixels_y )) + xb=$(( (($pixels_x-503)*(3-$x))/2 )) + xterm-CT "chiark ssh #$x" -geometry $sz+$xb+$y \ + -e ssh tunnel.chiark.greenend.org.uk -l ijackson & + echo -n : +# xterm-CT "chiark ssh ian #$x" -geometry $sz+$(( $pixels_x + $xb ))+$y \ +# -e ssh tunnel.chiark.greenend.org.uk -l ian & +# echo -n : +done diff --git a/dot/configs/list b/dot/configs/list index 8caa118..daee795 100644 --- a/dot/configs/list +++ b/dot/configs/list @@ -6,19 +6,20 @@ keycodes=8-108 : kb=pericom keycodes=8-114 : kb=pc keycodes=8-134 : kb=pc keycodes=8-157 : kb=pc +keycodes=8-255 : kb=pc keycodes=8-119 : kb=archim bvolume=70 bpitch=900 bduration=70 keycodes=8-132 : kb=sun4 keycodes=8-144 : kb=dsxt keycodes=8-254 : kb=tektronix -keycodes=8-255 : kb=liberator keycodes=10-135 : kb=hp keycodes=86-251 : kb=ds +display=mariner : bvolume=60 bpitch=300 bduration=50 + depth>3 : colours=colour pixels_x<1024 : size=small dpi_x>104 : font=larger pixels_x>1024 : maccel=4 mthresh=5 -dpi_x>99 : maccel=3 mthresh=5 display=lettuce : font=fixed display=flamingo : font=fixed @@ -29,5 +30,3 @@ display=ufford : kb=ds3100 display=grover : maccel=10 display=puffball : font=puffball brokenserver=true - -host=zealot : kb=zealot font=zealot maccel=8 mthresh=2 diff --git a/dot/configs/rxprofile-root b/dot/configs/rxprofile-root deleted file mode 100755 index cab8a01..0000000 --- a/dot/configs/rxprofile-root +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -. .configs/setenvir - -stty cs8 2>/dev/null || : - -#xloadt& -exec really diff --git a/dot/configs/setenvir b/dot/configs/setenvir index 301c8a2..581a36c 100644 --- a/dot/configs/setenvir +++ b/dot/configs/setenvir @@ -4,19 +4,16 @@ PATH=$HOME/personal/linux-i386/bin:$HOME/personal/scripts/bin -CVS_RSH=ssh -DEBEMAIL=ijackson@chiark.greenend.org.uk -EMAIL=ijackson@chiark.greenend.org.uk -export DEBEMAIL EMAIL + +PATH=$PATH:/usr/lib/ccache:/usr/lib/git-core + -PATH=$PATH:/usr/lib/ccache PATH=$PATH:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin -PATH=$PATH:/usr/lib/git-core @@ -27,6 +24,7 @@ PATH=$PATH:/usr/bin/X11 export PATH CDPATH=:..:$HOME:$HOME/things +CVS_RSH=ssh unset MAILPATH @@ -34,12 +32,18 @@ unset MAILPATH + +NNTPAUTH="md5cookie1way ijacksonxen" +NNTPSERVER=tunnel.chiark.greenend.org.uk +export NNTPAUTH NNTPSERVER +export GIT_COMMITTER_EMAIL=Ian.Jackson@eu.citrix.com + + EDITOR=emacs HISTORY=256 HOST=`hostname` -#LANG=C +LANG=C LESS="-eMfQj10" -# NNTPAUTH="md5cookie1way ian" PAGER=less # PERLLIB=$HOME/personal/linux/lib/perl5 PS1="$ " @@ -51,8 +55,20 @@ export PAGER PERLLIB PS1 TRNINIT WWW_HOME # NNTPAUTH -LVM_SUPPRESS_FD_WARNINGS=1 -export LVM_SUPPRESS_FD_WARNINGS + +if test -d /mariner64; then + XEN_COMPILE_ARCH=x86_32 + export XEN_COMPILE_ARCH +fi + + +if [ "x$debian_chroot" = x ] && test -f /etc/debian_chroot; then + read ".counters/v.$DISPLAY" echo -n 'starting clients ' -#.configs/unpriv-xauth - # xsetroot -fg '#883030' -bg '#204050' -bitmap bitmap/root # xsetroot -cursor bitmap/circle bitmap/circle-inv -fg white -bg black # xset b 75 300 @@ -29,10 +25,6 @@ echo -n 'starting clients ' echo -n . -tail -F /var/log/hspa & - -echo -n . - sh .configs/x11start-colours=$colours echo -n . @@ -47,10 +39,8 @@ echo -n . # fi xsetroot -cursor bitmap/circle bitmap/circle-inv -bg black -fg white -#xset b $bvolume $bpitch $bduration -echo x11start -xset m $maccel $mthresh c off -# b 60 +xset b $bvolume $bpitch $bduration +xset m $maccel $mthresh c off b 60 echo -n . diff --git a/dot/configs/xbiffs b/dot/configs/xbiffs index 20569a9..5be0a0d 100755 --- a/dot/configs/xbiffs +++ b/dot/configs/xbiffs @@ -12,9 +12,5 @@ echo -n @ #DISPLAY="$d" #export DISPLAY #exec 2>>.remoteshell-errors -#xbiff & -#MAILHOST=login.chiark.greenend.org.uk xbiff1339 -name xbiffc -user ijackson & -#MAILHOST=login.chiark.greenend.org.uk xbiff1339 -name xbiffp -user ian & -#MAILHOST=login.chiark.greenend.org.uk xbiff1339 -name xbiffs -user sysadmin & -echo -n @ -#END + + diff --git a/dot/configs/xclients b/dot/configs/xclients index 81ea9a7..3a15c3e 100755 --- a/dot/configs/xclients +++ b/dot/configs/xclients @@ -6,7 +6,7 @@ eval `cd $HOME && .configs/configure` # #echo -n : -(sleep 1; exec vtwm) & +exec vtwm & echo -n : @@ -17,21 +17,9 @@ echo -n : xterm -n 'xterm d' -T xterm -geometry 80x25+0-10 & -trayer --SetDockType true --widthtype request --edge top --align left --margin 30 & -mate-power-manager & -(set -e; cd $HOME/things/Systray/applet.git; ./xbatmon-simple-tray) & -(sleep 1; exec nm-applet) & - - .configs/chiarks -# -#if test -d /proc/acpi/battery; then -# xacpi-simple & -#fi -# - .configs/xbiffs diff --git a/dot/configs/xmodmap-kb=liberator b/dot/configs/xmodmap-kb=liberator deleted file mode 100644 index 70e7266..0000000 --- a/dot/configs/xmodmap-kb=liberator +++ /dev/null @@ -1,26 +0,0 @@ -pointer = 1 3 2 - -keycode 11 = 2 quotedbl -keycode 12 = 3 numbersign -keycode 22 = BackSpace -keycode 48 = apostrophe at -keycode 51 = numbersign asciitilde -keycode 94 = backslash bar - -keycode 133 = Super_L -remove Mod1 = Alt_L -remove mod4 = Super_L -add Mod1 = Alt_L Super_L - -! keycode 234 = Prior -! keycode 233= Next -! keycode 166 = Prior -! keycode 167 = Next -! keycode 113 = Alt_R Meta_R - -remove Lock = Caps_Lock -remove Control = Control_L -keycode 37 = Caps_Lock -keycode 66 = Control_L -add Lock = Caps_Lock -add Control = Control_L diff --git a/dot/configs/xmodmap-kb=pc b/dot/configs/xmodmap-kb=pc index f6fcda5..a78001a 100644 --- a/dot/configs/xmodmap-kb=pc +++ b/dot/configs/xmodmap-kb=pc @@ -4,8 +4,12 @@ keycode 22 = BackSpace keycode 48 = apostrophe at keycode 51 = numbersign asciitilde keycode 94 = backslash bar -keycode 103 = Prior -keycode 99 = End + +keycode 115 = Prior +keycode 112 = End + +! keycode 103 = Prior +! keycode 99 = End remove Lock = Caps_Lock remove Control = Control_L diff --git a/dot/configs/xmodmap-kb=zealot b/dot/configs/xmodmap-kb=zealot deleted file mode 100644 index d879bd3..0000000 --- a/dot/configs/xmodmap-kb=zealot +++ /dev/null @@ -1,28 +0,0 @@ -keycode 11 = 2 quotedbl -keycode 12 = 3 numbersign -keycode 22 = BackSpace -keycode 48 = apostrophe at -keycode 51 = numbersign asciitilde -keycode 94 = backslash bar - -keycode 110 = Prior -keycode 115 = Next -keycode 112 = Home -keycode 117 = End - -remove mod4 = Super_L -add Mod1 = Alt_L Super_L - -!keycode 121 = F1 -!keycode 122 = F2 -!keycode 123 = F3 -!keycode 173 = F4 -!keycode 172 = F5 -!keycode 171 = F6 - -remove Lock = Caps_Lock -remove Control = Control_L -keycode 37 = Caps_Lock -keycode 66 = Control_L -add Lock = Caps_Lock -add Control = Control_L diff --git a/dot/configs/xprofile b/dot/configs/xprofile index 6304c78..2a5ba1d 100755 --- a/dot/configs/xprofile +++ b/dot/configs/xprofile @@ -7,10 +7,8 @@ echo '' -if [ "`uname -n`" != zealot ]; then - echo -n 'Hit return for windows... ' - read inputline -fi +echo -n 'Hit return for windows... ' +read inputline if [ "x$inputline" = x ] then exec .configs/x11start diff --git a/dot/configs/xsession-errors b/dot/configs/xsession-errors new file mode 100644 index 0000000..280adc6 --- /dev/null +++ b/dot/configs/xsession-errors @@ -0,0 +1,280 @@ +xsession running +BASH=/bin/bash +BASHOPTS=cmdhist:extquote:force_fignore:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath +BASH_ALIASES=() +BASH_ARGC=() +BASH_ARGV=() +BASH_CMDS=() +BASH_LINENO=([0]="0") +BASH_SOURCE=([0]="/u/iwj/.xsession") +BASH_VERSINFO=([0]="4" [1]="2" [2]="37" [3]="1" [4]="release" [5]="i486-pc-linux-gnu") +BASH_VERSION='4.2.37(1)-release' +CDPATH=:..:/u/iwj:/u/iwj/things +CVS_RSH=ssh +DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-N1QZsxAgPb,guid=76ba8812f23279c0c5de6f9355378ce6 +DESKTOP_SESSION=default +DIRSTACK=() +DISPLAY=:0 +EDITOR=emacs +EUID=2009 +GDMSESSION=default +GIT_COMMITTER_EMAIL=Ian.Jackson@eu.citrix.com +GROUPS=() +HISTORY=256 +HOME=/u/iwj +HOST=mariner +HOSTNAME=mariner +HOSTTYPE=i486 +IFS=$' \t\n' +LANG=C +LANGUAGE=en_GB:en +LESS=-eMfQj10 +LOGNAME=iwj +MACHTYPE=i486-pc-linux-gnu +NNTPAUTH='md5cookie1way ijacksonxen' +NNTPSERVER=tunnel.chiark.greenend.org.uk +OPTERR=1 +OPTIND=1 +OSTYPE=linux-gnu +PAGER=less +PATH=/u/iwj/personal/linux-i386/bin:/u/iwj/personal/scripts/bin:/usr/lib/ccache:/usr/lib/git-core:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin:/usr/bin/X11 +PIPESTATUS=([0]="0") +PPID=3935 +PS1='$ ' +PS4='+ ' +PWD=/u/iwj +SHELL=/bin/bash +SHELLOPTS=braceexpand:hashall:interactive-comments +SHLVL=1 +SSH_AGENT_PID=3991 +SSH_AUTH_SOCK=/tmp/ssh-qrMKXAkl7JlM/agent.3955 +TERM=dumb +TRNINIT=/u/iwj/.trninit +UID=2009 +USER=iwj +USERNAME=iwj +WINDOWPATH=7 +WWW_HOME=http://www.chiark.greenend.org.uk/~ijackson/ +XAUTHORITY=/var/run/gdm3/auth-for-iwj-W5imNC/database +XDG_SESSION_COOKIE=71ed3055065182eaccd9e10e52837e3e-1429703909.694327-1758498583 +XEN_COMPILE_ARCH=x86_32 +_=bpitch=300 +arch=Linux2 +bduration=50 +bpitch=300 +brokenbadges=true +brokenserver=false +bvolume=60 +colours=colour +depth=24 +display=mariner +dpi_x=96 +dpi_y=96 +echo=echo +font=fixed +host=mariner +kb=pc +keycodes=8-255 +lxtermopts=-rv +maccel=4 +mm_x=423 +mm_y=318 +mthresh=5 +pixels_x=1600 +pixels_y=1200 +printer=wind +size=normal +visual=TrueColor +xauth=false +.configs/Xresources-colours=colour:1:15: warning: missing terminating ' character [enabled by default] +.configs/Xresources-font=fixed:1:15: warning: missing terminating ' character [enabled by default] +.configs/Xresources-font=fixed:4:2: error: invalid preprocessing directive #emacs +.configs/Xresources-size=normal:1:15: warning: missing terminating ' character [enabled by default] +xsession running +BASH=/bin/bash +BASHOPTS=cmdhist:extquote:force_fignore:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath +BASH_ALIASES=() +BASH_ARGC=() +BASH_ARGV=() +BASH_CMDS=() +BASH_LINENO=([0]="0") +BASH_SOURCE=([0]="/u/iwj/.xsession") +BASH_VERSINFO=([0]="4" [1]="2" [2]="37" [3]="1" [4]="release" [5]="i486-pc-linux-gnu") +BASH_VERSION='4.2.37(1)-release' +CDPATH=:..:/u/iwj:/u/iwj/things +CVS_RSH=ssh +DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-7xhvDKwYGI,guid=2dd5e11e8cf12e4024a164cc5559b6de +DESKTOP_SESSION=default +DIRSTACK=() +DISPLAY=:0 +EDITOR=emacs +EUID=2009 +GDMSESSION=default +GIT_COMMITTER_EMAIL=Ian.Jackson@eu.citrix.com +GROUPS=() +HISTORY=256 +HOME=/u/iwj +HOST=mariner +HOSTNAME=mariner +HOSTTYPE=i486 +IFS=$' \t\n' +LANG=C +LANGUAGE=en_GB:en +LESS=-eMfQj10 +LOGNAME=iwj +MACHTYPE=i486-pc-linux-gnu +NNTPAUTH='md5cookie1way ijacksonxen' +NNTPSERVER=tunnel.chiark.greenend.org.uk +OPTERR=1 +OPTIND=1 +OSTYPE=linux-gnu +PAGER=less +PATH=/u/iwj/personal/linux-i386/bin:/u/iwj/personal/scripts/bin:/usr/lib/ccache:/usr/lib/git-core:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin:/usr/bin/X11 +PIPESTATUS=([0]="0") +PPID=3986 +PS1='$ ' +PS4='+ ' +PWD=/u/iwj +SHELL=/bin/bash +SHELLOPTS=braceexpand:hashall:interactive-comments +SHLVL=1 +SSH_AGENT_PID=4042 +SSH_AUTH_SOCK=/tmp/ssh-yVfRaL1R27L9/agent.4006 +TERM=dumb +TRNINIT=/u/iwj/.trninit +UID=2009 +USER=iwj +USERNAME=iwj +WINDOWPATH=7 +WWW_HOME=http://www.chiark.greenend.org.uk/~ijackson/ +XAUTHORITY=/var/run/gdm3/auth-for-iwj-v3znwp/database +XDG_SESSION_COOKIE=71ed3055065182eaccd9e10e52837e3e-1431942877.337726-1821468183 +XEN_COMPILE_ARCH=x86_32 +_=bpitch=300 +arch=Linux2 +bduration=50 +bpitch=300 +brokenbadges=true +brokenserver=false +bvolume=60 +colours=colour +depth=24 +display=mariner +dpi_x=96 +dpi_y=96 +echo=echo +font=fixed +host=mariner +kb=pc +keycodes=8-255 +lxtermopts=-rv +maccel=4 +mm_x=423 +mm_y=318 +mthresh=5 +pixels_x=1600 +pixels_y=1200 +printer=wind +size=normal +visual=TrueColor +xauth=false +.configs/Xresources-colours=colour:1:15: warning: missing terminating ' character [enabled by default] +.configs/Xresources-font=fixed:1:15: warning: missing terminating ' character [enabled by default] +.configs/Xresources-font=fixed:4:2: error: invalid preprocessing directive #emacs +.configs/Xresources-size=normal:1:15: warning: missing terminating ' character [enabled by default] +xsession running +BASH=/bin/bash +BASHOPTS=cmdhist:complete_fullquote:extquote:force_fignore:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath +BASH_ALIASES=() +BASH_ARGC=() +BASH_ARGV=() +BASH_CMDS=() +BASH_LINENO=([0]="0") +BASH_SOURCE=([0]="/u/iwj/.xsession") +BASH_VERSINFO=([0]="4" [1]="3" [2]="30" [3]="1" [4]="release" [5]="i586-pc-linux-gnu") +BASH_VERSION='4.3.30(1)-release' +CDPATH=:..:/u/iwj:/u/iwj/things +CVS_RSH=ssh +DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-cRlMBZUFbC,guid=3743490fe0cb7994827a3916575ae4a3 +DIRSTACK=() +DISPLAY=:0 +EDITOR=emacs +EUID=2009 +GIT_COMMITTER_EMAIL=Ian.Jackson@eu.citrix.com +GROUPS=() +HISTORY=256 +HOME=/u/iwj +HOST=mariner +HOSTNAME=mariner +HOSTTYPE=i586 +IFS=$' \t\n' +LANG=C +LANGUAGE=en_GB:en +LESS=-eMfQj10 +LOGNAME=iwj +MACHTYPE=i586-pc-linux-gnu +NNTPAUTH='md5cookie1way ijacksonxen' +NNTPSERVER=tunnel.chiark.greenend.org.uk +OPTERR=1 +OPTIND=1 +OSTYPE=linux-gnu +PAGER=less +PATH=/u/iwj/personal/linux-i386/bin:/u/iwj/personal/scripts/bin:/usr/lib/ccache:/usr/lib/git-core:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin:/usr/bin/X11 +PIPESTATUS=([0]="0") +PPID=3099 +PS1='$ ' +PS4='+ ' +PWD=/u/iwj +SHELL=/bin/bash +SHELLOPTS=braceexpand:hashall:interactive-comments +SHLVL=1 +SSH_AGENT_PID=3124 +SSH_AUTH_SOCK=/tmp/ssh-w4GHCWlnWVhC/agent.3099 +TERM=dumb +TRNINIT=/u/iwj/.trninit +UID=2009 +USER=iwj +WINDOWPATH=7 +WWW_HOME=http://www.chiark.greenend.org.uk/~ijackson/ +XDG_SESSION_COOKIE=71ed3055065182eaccd9e10e52837e3e-1465574563.55040-60649872 +XEN_COMPILE_ARCH=x86_32 +_=bpitch=300 +arch=Linux2 +bduration=50 +bpitch=300 +brokenbadges=true +brokenserver=false +bvolume=60 +colours=colour +depth=24 +display=mariner +dpi_x=96 +dpi_y=96 +echo=echo +font=fixed +host=mariner +kb=pc +keycodes=8-255 +lxtermopts=-rv +maccel=4 +mm_x=423 +mm_y=318 +mthresh=5 +pixels_x=1600 +pixels_y=1200 +printer=wind +size=normal +visual=TrueColor +xauth=false +.configs/Xresources-colours=colour:1:15: warning: missing terminating ' character + !# Ian Jackson's X Resources file + ^ +.configs/Xresources-font=fixed:1:15: warning: missing terminating ' character + !# Ian Jackson's X resources file + ^ +.configs/Xresources-font=fixed:4:2: error: invalid preprocessing directive #emacs + #emacs.font: fixed + ^ +.configs/Xresources-size=normal:1:15: warning: missing terminating ' character + !# Ian Jackson's X Resources file + ^ diff --git a/dot/configs/xtools b/dot/configs/xtools index 2edb231..94bfb51 100755 --- a/dot/configs/xtools +++ b/dot/configs/xtools @@ -5,6 +5,5 @@ eval `.configs/configure` echo -n + # xlbiff & echo -n + -#unclutter -noevents & +unclutter -noevents & echo -n + -echo xtools diff --git a/dot/gitconfig b/dot/gitconfig index f037d19..1d39224 100644 --- a/dot/gitconfig +++ b/dot/gitconfig @@ -1,16 +1,11 @@ [user] - name = Ian Jackson - email = ijackson@chiark.greenend.org.uk + email="ian.jackson@eu.citrix.com" [sendemail] - smtpdomain = zealot.relativity.greenend.org.uk - smtpserver = tunnel.chiark.greenend.org.uk - smtpserverport = 25 - envelopesender = ijackson@chiark.greenend.org.uk - bcc = ijackson@chiark.greenend.org.uk -[dgit-distro "debian"] - username = iwj -# mirror = http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/ - keyid = 0x48B50D39 + bcc = ian.jackson@eu.citrix.com +[url "git://git-cache.xs.citrite.net:9419/git://"] + insteadOf = git:// +[url "git://git-cache.xs.citrite.net:9419/git://"] + insteadOf = git://git-cache.xs.citrite.net:9419/git:// [color] - diff = false - ui = false + diff = false + ui = false diff --git a/dot/gitk b/dot/gitk index 6fffced..b9e9b33 100644 --- a/dot/gitk +++ b/dot/gitk @@ -1,6 +1,6 @@ -set mainfont {Helvetica 14} -set textfont {Courier 14} -set uifont {Helvetica 14 bold} +set mainfont {{Bitstream Vera Sans} 8} +set textfont fixed +set uifont {Helvetica 9 bold} set tabstop 8 set findmergefiles 0 set maxgraphpct 50 @@ -10,53 +10,27 @@ set wrapcomment none set autoselect 1 set autosellen 40 set showneartags 1 -set maxrefs 20 -set visiblerefs {"master"} set hideremotes 0 set showlocalchanges 1 set datetimeformat {%Y-%m-%d %H:%M:%S} set limitdiffs 1 set uicolor grey85 set want_ttk 1 -set bgcolor #000000 -set fgcolor #ffffff -set uifgcolor black -set uifgdisabledcolor #999 +set bgcolor white +set fgcolor black set colors {green red blue magenta darkgrey brown orange} -set diffcolors {{#ff8888} #88ff88 #8080ff} -set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} +set diffcolors {{#ff6b66} #005400 blue} set markbgcolor #e0e0ff set diffcontext 3 -set selectbgcolor #333366 -set foundbgcolor yellow -set currentsearchhitbgcolor orange +set selectbgcolor gray85 set extdifftool meld set perfile_attrs 0 -set headbgcolor #00ff00 -set headfgcolor black -set headoutlinecolor black -set remotebgcolor #ffddaa -set tagbgcolor yellow -set tagfgcolor black -set tagoutlinecolor black -set reflinecolor black -set filesepbgcolor #aaaaaa -set filesepfgcolor black -set linehoverbgcolor #ffff80 -set linehoverfgcolor black -set linehoveroutlinecolor black -set mainheadcirclecolor yellow -set workingfilescirclecolor red -set indexcirclecolor green -set circlecolors {white blue gray blue blue} -set linkfgcolor blue -set circleoutlinecolor black -set geometry(main) 1295x1675+1048+53 +set geometry(main) 959x1054+535+86 set geometry(state) normal -set geometry(topwidth) 1295 -set geometry(topheight) 692 -set geometry(pwsash0) "836 1" -set geometry(pwsash1) "1027 1" -set geometry(botwidth) 984 -set geometry(botheight) 978 +set geometry(topwidth) 959 +set geometry(topheight) 422 +set geometry(pwsash0) "619 1" +set geometry(pwsash1) "838 1" +set geometry(botwidth) 669 +set geometry(botheight) 627 set permviews {} diff --git a/dot/screenrc b/dot/screenrc index da8c394..9d28eab 100644 --- a/dot/screenrc +++ b/dot/screenrc @@ -2,3 +2,4 @@ c1 off escape ^]^] defescape ^Z^A nethack on +unsetenv DISPLAY diff --git a/dot/vtwmrc b/dot/vtwmrc index 844ca56..29c3b3c 100644 --- a/dot/vtwmrc +++ b/dot/vtwmrc @@ -19,6 +19,8 @@ Zoom NoRaiseOnMove NoRaiseOnResize SortIconManager +NoTitle { "TWM Icon Manager" "VTWM Desktop" "xclock" "xload" } +DontSqueezeTitle { "emacs" "emacs18" "epoch" "Emacs" } SqueezeTitle RestartPreviousState WarpCursor @@ -26,18 +28,9 @@ Function "select" { f.iconify f.deiconify } WindowFunction f.function "select" WindowRing { "emacs" "emacs18" "XTerm" } OldFashionedTwmWindowsMenu +NoStackMode { "emacs" } -NoStackMode { - "Iceweasel" -} - -#VirtualDesktop "6x5-0-0" 48 -VirtualDesktop "19200x9100-0-0" 48 - -#VirtualDesktop "8228x3848-0-0" 48 - -#VirtualDesktop "6432x3608-208-0" 48 - +VirtualDesktop "6432x3608-208-0" 48 #VirtualDesktop "6400x3600-208-0" 48 # +32,+8 @@ -55,22 +48,6 @@ FixManagedVirtualGeometries FixTransientVirtualGeometries SnapRealScreen -NoTitle { - "TWM Icon Manager" - "VTWM Desktop" - "xclock" - "panel" - "xload" - "xacpi-simple" -} - -DontSqueezeTitle { - "emacs" - "emacs18" - "epoch" - "Emacs" -} - DontShowInDisplay { "VTWM Desktop" "xb ian" @@ -80,8 +57,6 @@ DontShowInDisplay { "xclock" "xload" "XLoad" - "panel" - "xacpi-simple" } NailedDown { @@ -94,8 +69,6 @@ NailedDown { "xwrits" "xload" "XLoad" - "panel" - "xacpi-simple" } Cursors @@ -177,7 +150,7 @@ Button2 = : desktop : f.movescreen Button1 = : icon|iconmgr|frame|title : f.function "move-or-raise" Button2 = : icon|iconmgr|frame|title : f.function "forcemove-or-lower" Button3 = : icon|iconmgr|frame|title : f.menu "windowmenu" -Button1 = shift : icon|iconmgr|frame|title : f.resize +Button1 = shift : icon|iconmgr|frame|title : f.iconify Button2 = shift : icon|iconmgr|frame|title : f.resize Button3 = shift : icon|iconmgr|frame|title : f.zoom Button1 = m : icon|iconmgr|frame|title : f.focus @@ -189,34 +162,16 @@ Button1 = control|shift|m : window|frame|title : f.destroy Button2 = control|shift|m : window|frame|title : f.forcemove Button3 = control|shift|m : window|frame|title : f.menu "windowmenu" -"Up" = m : all : f.function "pan-up" -"Down" = m : all : f.function "pan-down" -"Left" = m : all : f.function "pan-left" -"Right" = m : all : f.function "pan-right" - -Function "pan-up" { - !"raise-mini-desktop" - f.panup "100" -} -Function "pan-down" { - !"raise-mini-desktop" - f.pandown "100" -} -Function "pan-left" { - !"raise-mini-desktop" - f.panleft "100" -} -Function "pan-right" { - !"raise-mini-desktop" - f.panright "100" -} +"Up" = m : all : f.panup "100" +"Down" = m : all : f.pandown "100" +"Left" = m : all : f.panleft "100" +"Right" = m : all : f.panright "100" Function "drag-with-up" { f.nail f.panup "100" f.raise f.nail - !"raise-mini-desktop" } Function "drag-with-down" { @@ -224,21 +179,20 @@ Function "drag-with-down" { f.pandown "100" f.raise f.nail - !"raise-mini-desktop" } + Function "drag-with-left" { f.nail f.panleft "100" f.raise f.nail - !"raise-mini-desktop" } + Function "drag-with-right" { f.nail f.panright "100" f.raise f.nail - !"raise-mini-desktop" } "Up" = m|shift : window|frame|title : f.function "drag-with-up" @@ -247,7 +201,7 @@ Function "drag-with-right" { "Right" = m|shift : window|frame|title : f.function "drag-with-right" # Accelerators out of icon manager -# "F1" = : icon|window|frame|title : f.iconify +#"F1" = : icon|window|frame|title : f.iconify "F2" = : icon|window|frame|title : f.raise "F3" = : icon|window|frame|title : f.lower "F1" = : iconmgr : f.hideiconmgr @@ -296,7 +250,7 @@ menu "special" { "Management" f.title "Refresh" f.refresh - "Restart" f.function "restart" + "Restart" f.restart "" f.nop "Kill twm" f.quit "" f.nop @@ -304,21 +258,16 @@ menu "special" "Hide icon list" f.hideiconmgr } -Function "restart" { - !"rm .configs/mini-desktop-window-id" - f.restart -} - menu "programs" { "Programs" f.title "Emacs restart" !".configs/startemacs" "Emacs left" !"emacs -geometry 79x40+0+35 &" "" f.nop - "IRC Diziet" !"xterm -geometry 80x24+24-0 -T ' IRC' -e sh -c 'ssh -vt ijackson@tunnel.chiark.greenend.org.uk screen -x irc; read x' &" -# "IRC iwj" !"xterm -geometry 80x70+340-0 -T 'IRC iwj' -e irc iwj cam.irc.devel.ncipher.com &" + "IRC Diziet" !"xterm -geometry 80x70+240-0 -T 'IRC Diziet' -e irc Diziet localhost &" + "IRC iwj" !"xterm -geometry 80x70+340-0 -T 'IRC iwj' -e irc iwj cam.irc.devel.ncipher.com &" "" f.nop - "Trn" !"xterm -geometry 80x45+240+95 -e trn &" + "Trn" !"MAILCAPS=/u/iwj/.trnmailcap xterm -geometry 80x45+240+95 -e trn4 &" "Archie" !"xarchie &" "Calc" !"xcalc &" # "Xab large" !"xab &" @@ -361,9 +310,9 @@ Menu "hosts" "Shep" !"xterm-CT 'shep ssh' -e ssh shep.cl.cam.ac.uk -l iwj10 &" "Ouse" !"xterm-CT 'ouse ssh' -e ssh ouse.cl.cam.ac.uk -l iwj10 &" "" f.nop - "Chiark" !"xterm-CT 'chiark ssh' -e ssh chiark.greenend.org.uk -l ijackson &" - "Chiark ian" !"xterm-CT 'chiark ssh ian' -e ssh chiark.greenend.org.uk -l ian &" - "Chiark II" !"xterm-CT 'chiark ssh II' -e ssh chiark.greenend.org.uk -t -l ijackson personal/linux/bin/II &" + "Chiark" !"xterm-CT 'chiark ssh' -e ssh tunnel.chiark.greenend.org.uk -l ijackson &" + "Chiark ian" !"xterm-CT 'chiark ssh ian' -e ssh tunnel.chiark.greenend.org.uk -l ian &" + "Chiark II" !"xterm-CT 'chiark ssh II' -e ssh tunnel.chiark.greenend.org.uk -t -l ijackson personal/linux/bin/II &" "Iguana" !"xterm-CT 'iguana ssh' -e ssh iguana.ucam.org -l ijackson &" "Utter" !"xterm-CT 'utter ssh' -e ssh utter.chaos.org.uk -l ijackson &" "" f.nop diff --git a/dot/xsession b/dot/xsession index eeb2a21..d54d437 100644 --- a/dot/xsession +++ b/dot/xsession @@ -5,8 +5,6 @@ echo xsession running . .configs/setenvir -rm .configs/mini-desktop-window-id - eval `.configs/configure` set @@ -23,8 +21,6 @@ xrdb -merge .configs/Xresources-colours=$colours xrdb -merge .configs/Xresources-font=$font xrdb -merge .configs/Xresources-size=$size -xset b off - ${lxtermpath}xterm -C $lxtermopts -T "login" -e .configs/xprofile echo xterm done logging out again rm .configs/xsession-errors diff --git a/home/emacs/ian-x.el b/home/emacs/ian-x.el index d498fb4..c0273af 100644 --- a/home/emacs/ian-x.el +++ b/home/emacs/ian-x.el @@ -1,20 +1,16 @@ -; Ian's X initialisations. +2; Ian's X initialisations. (if (not (string-match "^18\." emacs-version)) (require 'ian-x19) -; (require 'x-fix-mouse) -; (define-key mouse-map x-button-left-up 'x-cut-text-if-moved) -; (define-key mouse-map x-button-middle 'x-cut-text) -; (define-key mouse-map x-button-c-middle 'x-cut-and-wipe-text) -; (define-key mouse-map x-button-right 'x-paste-text)) -) + (require 'x-fix-mouse) + (define-key mouse-map x-button-left-up 'x-cut-text-if-moved) + (define-key mouse-map x-button-middle 'x-cut-text) + (define-key mouse-map x-button-c-middle 'x-cut-and-wipe-text) + (define-key mouse-map x-button-right 'x-paste-text)) ; (x-set-cursor-color "white") ; (x-set-foreground-color "white") ; (x-set-background-color "black") -(if (boundp 'tool-bar-mode) - (tool-bar-mode -1)) - ; End of this file. diff --git a/home/emacs/ian-x19.el b/home/emacs/ian-x19.el index a0a9aed..25deeab 100644 --- a/home/emacs/ian-x19.el +++ b/home/emacs/ian-x19.el @@ -1,4 +1,4 @@ -; Ian's X, Emacs-19 (and higher) initialisations +; Ian's X, Emacs-19 initialisations ;(setq frame-title-format ; '(multiple-frames "%b" ("" invocation-name " : " @@ -51,8 +51,8 @@ (global-unset-key [down-C-mouse-3]) (global-set-key [down-C-mouse-3] 'run-programs-menu) -;(global-set-key [mouse-2] 'mouse-yank-at-click) -;(global-set-key [mouse-3] 'mouse-save-then-kill) +(global-set-key [mouse-2] 'mouse-yank-at-click) +(global-set-key [mouse-3] 'mouse-save-then-kill) ;(setq interprogram-paste-function ; '(lambda () (x-get-cut-buffer 0))) diff --git a/home/emacs/ian.el b/home/emacs/ian.el index d68ac34..d08f100 100644 --- a/home/emacs/ian.el +++ b/home/emacs/ian.el @@ -1,20 +1,11 @@ ; This is my real emacs start-up file (for chiark). ; - -(defalias 'perl-mode 'cperl-mode) -(setq cperl-invalid-face nil - cperl-indent-level 4 - cperl-continued-statement-offset 4) - (make-variable-buffer-local 'indent-line-function) ; Un-disable narrow and eval-expression (put 'narrow-to-region 'disabled nil) (put 'eval-expression 'disabled nil) (standard-display-european t) ; -(setq browse-url-netscape-program "mozilla") -(setq common-lisp-hyperspec-root "/usr/share/doc/hyperspec/") -; ; Make sure we don't disturb links or change ownership, use numbers (setq backup-by-copying-when-mismatch t) (setq backup-by-copying-when-linked t) @@ -35,18 +26,20 @@ (setq enable-local-variables 'ask-me) (setq enable-recursive-minibuffers t) (setq compile-command "make") -(setq next-line-add-newlines t) +(setq compilation-context-lines 0) +(setq compilation-skip-threshold 0) +(setq compilation-scroll-output 'first-error) +(global-set-key "\\" 'previous-error) (setq diff-switches "-u") -(setq line-move-visual nil) (display-time) +(setq next-line-add-newlines t) ; (set-variable 'search-repeat-char 28) -(set-fringe-mode (cons 0 nil)) (if (string-match "^19\." emacs-version) (progn -; (setq file-name-handler-alist ; Disable nasty auto-loading of ange-ftp -; (delq (rassq 'ange-ftp-completion-hook-function file-name-handler-alist) -; file-name-handler-alist)) + (setq file-name-handler-alist ; Disable nasty auto-loading of ange-ftp + (delq (rassq 'ange-ftp-completion-hook-function file-name-handler-alist) + file-name-handler-alist)) (require 'find-alternate-18style) (defun unset-down-mouse-23 () (local-set-key [mouse-2] 'mouse-yank-at-click) @@ -60,10 +53,14 @@ (function (lambda () (local-set-key " " 'scroll-up) (local-set-key "" 'scroll-down)))) + (add-hook 'sh-mode-hook + (function (lambda () + (local-set-key "<" 'self-insert-command)))) (define-key isearch-mode-map "" 'isearch-repeat-forward) (define-key isearch-mode-map "" 'isearch-quote-char))) ; (menu-bar-mode -1) +(tool-bar-mode -1) (defun terminal-keybindings () "This function should be called by the term-setup-hook mechanism" (interactive) @@ -72,7 +69,7 @@ ; Set keybindings generally (including I-search on C-\) ; (global-set-key " " 'self-insert-command) (global-set-key "" 'isearch-forward) -; (global-set-key " " 'newline) + (global-set-key " " 'newline-and-indent) (global-set-key "" 'set-mark-command) (global-set-key "" 'quoted-insert) ; @@ -91,7 +88,7 @@ (global-set-key "\12" 'bury-buffer) (global-set-key " " 'quicker-compile) (global-set-key "" 'exchange-point-and-mark) - (global-set-key "" 'load-tramp) + (global-set-key "" 'load-ange-ftp) (global-set-key "4" 'scroll-other-window) (global-set-key "4m" 'vm-mail-other-window) (global-set-key "9" 'vm-visit-folder) @@ -136,33 +133,63 @@ (global-set-key "\eOB" 'next-line)) (setq term-setup-hook 'terminal-keybindings) ; remap keys in due course ; +(setq frame-title-format + '(multiple-frames + (:eval + (let* + ((buf (current-buffer)) + (leaf (buffer-name buf)) + (dir default-directory)) + (if dir + (let* + ((dir (abbreviate-file-name dir)) + (node (replace-regexp-in-string "\\..*" "" system-name))) + (concat leaf " " node ":" dir)) + leaf))) + ("" invocation-name "@" system-name))) +;(setq frame-title-format +; '(multiple-frames +; (:eval +; (let* +; ((buf (current-buffer)) +; (fn (buffer-file-name buf))) +; (if fn +; (let* +; ((fn (abbreviate-file-name fn)) +; (dir (file-name-directory fn)) +; (leaf (file-name-nondirectory fn)) +; (node (replace-regexp-in-string "\\..*" "" system-name))) +; (concat leaf " " node ":" dir)) +; (buffer-name buf)))) +; ("" invocation-name "@" system-name))) +; ; Autoload definitions (autoload 'tar-mode "tar-mode") (autoload 'uncompress-while-visiting "uncompress") ; (autoload 'c++-mode "c++-mode" "Mode for editing C and C++ programs" t) (autoload 'hide-ifdef-mode "hideif" "For editing code with #ifdefs" t) -;(setq-default indent-tabs-mode nil) +(setq-default indent-tabs-mode nil) (autoload 'dired-find-alternate-file "dired-alternate" "Find alternately" t) (autoload 'dired-run-file "dired-alternate" "Run this file" t) (autoload 'perl-mode "perl-mode" "Mode for Perl code" t) ; (autoload 'rmail "rmail-fixed" "Patched mail reader" t) (autoload 'quicker-compile "quicker-compile" "Patched Compile mode" t) -(autoload 'vm "vm" "Start VM on your primary inbox." t) -(autoload 'vm-visit-folder "vm" "Start VM on an arbitrary folder." t) -(autoload 'vm-visit-virtual-folder "vm" "Visit a VM virtual folder." t) -(autoload 'vm-mode "vm" "Run VM major mode on a buffer" t) -(autoload 'vm-mail "vm" "Send a mail message using VM." t) -(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t) +;(autoload 'vm "vm" "Start VM on your primary inbox." t) +;(autoload 'vm-visit-folder "vm" "Start VM on an arbitrary folder." t) +;(autoload 'vm-visit-virtual-folder "vm" "Visit a VM virtual folder." t) +;(autoload 'vm-mode "vm" "Run VM major mode on a buffer" t) +;(autoload 'vm-mail "vm" "Send a mail message using VM." t) +;(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t) +; +;(require 'vm-autoload) ; ; (autoload 'info "info-fixed" "Patched info browser" t) (setq shell-mode-hook '(lambda () (make-variable-buffer-local 'scroll-step) (setq scroll-step 1))) -(setq inferior-lisp-program "sbcl") -;(setq jit-lock-chunk-size 100 -; jit-lock-stealth-time 1.00) +; (setq inferior-lisp-program "kcl") (setq dired-mode-hook '(lambda () (define-key dired-mode-map "F" 'dired-find-alternate-file) @@ -188,7 +215,6 @@ ; ("\\.tar$" . tar-mode) ("\\.pl$" . perl-mode) ("\\.ci$" . tex-mode) - ("\\.asm$" . fundamental-mode) ("\\.Z$" . uncompress-while-visiting)) auto-mode-alist)) (setq interpreter-mode-alist @@ -205,19 +231,14 @@ (local-set-key ";" 'self-insert-command))) (setq c++-mode-hook '(lambda () (hide-ifdef-mode 1) - (local-set-key "," 'self-insert-command) (local-set-key ":" 'electric-c++-terminator))) ; c++-electric-colon (setq c-mode-hook '(lambda () (hide-ifdef-mode 1) (c-set-offset 'substatement-open 0 nil) - (local-set-key "," 'self-insert-command) - (local-set-key ";" 'self-insert-command) - (local-set-key "/" 'self-insert-command) - (local-set-key "*" 'self-insert-command) - (local-set-key "#" 'self-insert-command) (local-set-key "(" 'self-insert-command) (local-set-key ")" 'self-insert-command) + (local-set-key ";" 'self-insert-command) (local-set-key "{" 'self-insert-command) (local-set-key " " 'newline-and-indent))) (setq c-hanging-comment-ender-p nil) @@ -289,12 +310,12 @@ then call send-and-exit." (insert-file (concat vm-folder-directory ",Formletter"))) ; ; This function bound to C-x C-z -(defun load-tramp () - "Load tramp using require, if it isn't loaded already" +(defun load-ange-ftp () + "Load ange-ftp using require, if it isn't loaded already" (interactive) - (message "Loading tramp...") - (require 'tramp) ; -extended - (message "Loading tramp...done")) + (message "Loading ange-ftp...") + (require 'ange-ftp) ; -extended + (message "Loading ange-ftp...done")) ; ; This function bound to M-+ (defun toggle-truncate-lines () @@ -329,6 +350,9 @@ then call send-and-exit." (concat "^" item " *\\((.*)\\)?$")))) list))) ; +; +(setq mail-signature nil) +; ; BBDB (setq bbdb-north-american-phone-numbers-p nil bbdb/mail-auto-create-p t @@ -337,7 +361,7 @@ then call send-and-exit." bbdb-message-caching-enabled t) ; ; VM stuff -;(load-file "~/private/private.el") +(load-file "~/private/private.el") (if (file-exists-p "~/private/private2.el") (load-file "~/private/private2.el")) (setq vm-included-text-attribution-format "%F writes (\"%s\"):\n" @@ -350,6 +374,7 @@ then call send-and-exit." vm-auto-next-message nil vm-jump-to-new-messages nil vm-jump-to-unread-messages nil + vm-auto-displayed-mime-content-types '("text" "multipart") vm-mime-digest-discard-header-regexp "only-drop-this-header" vm-preview-lines nil vm-included-text-prefix "> " @@ -385,40 +410,19 @@ then call send-and-exit." mail-archive-file-name "~/mail/Outbound" - vm-spool-files - '((vm-primary-inbox "/var/spool/mail/ian" - "~/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-spool-files (list + "~/mbox" + "~/mail/Outbound" + "~/mail/Record" + "~/mail/Import" + "~/mail/inbox" + "/var/mail/iwj" +; "imap-ssl:mail.citrix.com:993:inbox:login:ianj:*" +; (concat "imap-ssl:mail.citrix.com:993:inbox:cram-md5:ianj:*" ijackson-pop-password) + "/u/ijackson/mail/INBOX.CRASH" + "~/News/r") vm-startup-with-summary t - user-mail-address "ijackson@chiark.greenend.org.uk" - - -; vm-spool-files -; (list -; (list vm-primary-inbox "~/mbox" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/mail/Outbound" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/mail/Record" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/mail/Import" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "/var/spool/mail/ian" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/News/r" "~/mail/INBOX.CRASH") -; (list vm-sysadmin-inbox "~/mbox" "~/mail/SINBOX.CRASH") -; (list vm-sysadmin-inbox "~/mail/SOutbound" "~/mail/SINBOX.CRASH") -; (list vm-sysadmin-inbox "~/mail/Import" "~/mail/SINBOX.CRASH") -; (list vm-sysadmin-inbox "/var/spool/mail/sysadmin" "~/mail/SINBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mbox" "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mail/Outbound" -; "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mail/Record" "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mail/Import" "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" -; (concat "localhost:110:pass:ijackson:" ijackson-pop-password) -; "/u/ijackson/mail/INBOX.CRASH")) vm-startup-with-summary nil vm-summary-format "%3n %a %2d %3m %-19.19F %s\n" mail-archive-file-name "~/mail/Outbound" @@ -428,27 +432,27 @@ then call send-and-exit." '(lambda () (local-set-key "Q" 'vm-quit) (local-set-key "q" "###Q"))) -(add-hook 'mail-mode-hook - '(lambda () - (if (and (boundp 'folder-buffer) - folder-buffer - (string= (buffer-file-name folder-buffer) - (file-truename vm-sysadmin-inbox))) - (progn - (make-local-variable 'vm-mail-header-from) - (setq vm-mail-header-from - "sysadmin@chiark.greenend.org.uk (Ian Jackson)") - (make-local-variable 'mail-archive-file-name) - (setq mail-archive-file-name - "~/mail/SOutbound"))))) -; -;(defun vmi () +;(add-hook 'mail-mode-hook +; '(lambda () +; (if (and (boundp 'folder-buffer) +; folder-buffer +; (string= (buffer-file-name folder-buffer) +; (file-truename vm-sysadmin-inbox))) +; (progn +; (make-local-variable 'vm-mail-header-from) +; (setq vm-mail-header-from +; "sysadmin@chiark.greenend.org.uk (Ian Jackson)") +; (make-local-variable 'mail-archive-file-name) +; (setq mail-archive-file-name +; "~/mail/SOutbound"))))) +; +;;(defun vmi () ; (interactive) ; (vm "/u/ijackson/mail/INBOX")) ;; -(defun vms () - (interactive) - (vm vm-sinbin-inbox)) +;(defun vms () +; (interactive) +; (vm vm-sinbin-inbox)) ; (defun make-session () "Makes this emacs hard to kill by requiring ^X^Cy to kill it @@ -458,20 +462,20 @@ instead of just ^X^C." (global-set-key "y" 'save-buffers-kill-emacs)) ; ; Fix problems with M-| setting window title of emacs' parent xterm -(defun envdelete-term-termcap-windowid (list) - (let ((l list)) - (mapcar '(lambda (x) - (if x (delq x l))) - (mapcar '(lambda (x) - (if (or (string-match "^TERM=" x) - (string-match "^TERMCAP=" x) - (string-match "^WINDOWID=" x)) - x - nil)) - l)) - l)) -(setq process-environment - (envdelete-term-termcap-windowid process-environment)) +;(defun envdelete-term-termcap-windowid (list) +; (let ((l list)) +; (mapcar '(lambda (x) +; (if x (delq x l))) +; (mapcar '(lambda (x) +; (if (or (string-match "^TERM=" x) +; (string-match "^TERMCAP=" x) +; (string-match "^WINDOWID=" x)) +; x +; nil)) +; l)) +; l)) +;(setq process-environment +; (envdelete-term-termcap-windowid process-environment)) ; (defun add-insertion-keys (table) "Adds keybindings according to TABLE. Each element of @@ -527,4 +531,51 @@ The citation string is taken from cite-string." (> (point-max) (point))) (insert cite-string))))) ; +(blink-cursor-mode nil) +(setq c-basic-offset 4) +(setq indent-tabs-mode 4) +; +(require 'tramp) +(setq tramp-default-proxies-alist + (append '(("names\\.colo\\.xensource\\.com" + "root" "/ssh:names.colo.xensource.com:") + ("colo-dns1\\.colo\\.xensource\\.com" "root" + "/ssh:ianj@colo-dns1.colo.xensource.com:")) + tramp-default-proxies-alist)) +; /sudo:root@names.colo.xensource.com:/etc/bind/xen.org.zone +; /sudo:root@colo-dns1.colo.xensource.com:/etc/bind/xensource.com.zone + + + +(defun hack-dir-local-variables () + "Read per-directory local variables for the current buffer. +Store the directory-local variables in `dir-local-variables-alist' +and `file-local-variables-alist', without applying them." + (when (and enable-local-variables + (buffer-file-name)) + ;; Find the variables file. + (let ((variables-file (dir-locals-find-file (buffer-file-name))) + (class nil) + (dir-name nil)) + (cond + ((stringp variables-file) + (setq dir-name (file-name-directory (buffer-file-name))) + (setq class (dir-locals-read-from-file variables-file))) + ((consp variables-file) + (setq dir-name (nth 0 variables-file)) + (setq class (nth 1 variables-file)))) + (when class + (let ((variables + (dir-locals-collect-variables + (dir-locals-get-class-variables class) dir-name nil))) + (when variables + (dolist (elt variables) + (unless (memq (car elt) '(eval mode)) + (setq dir-local-variables-alist + (assq-delete-all (car elt) dir-local-variables-alist))) + (push elt dir-local-variables-alist)) + (hack-local-variables-filter variables dir-name))))))) + +(delete ".git/" completion-ignored-extensions) + ; End of this file. diff --git a/scripts/chrome b/scripts/chrome new file mode 100755 index 0000000..a3722c1 --- /dev/null +++ b/scripts/chrome @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +http_proxy=http://tunnel.chiark.greenend.org.uk:3128/ google-chrome diff --git a/scripts/gistatus b/scripts/gistatus index c95050f..4a5e7fc 100755 --- a/scripts/gistatus +++ b/scripts/gistatus @@ -1,3 +1,2 @@ #!/bin/sh -set -e exec git --no-pager status "$@" diff --git a/scripts/iwjendian b/scripts/iwjendian new file mode 100755 index 0000000..ad70999 --- /dev/null +++ b/scripts/iwjendian @@ -0,0 +1,2 @@ +#!/usr/bin/perl +printf "%x\n", unpack "L", "\1\2\3\4" or die $!; diff --git a/scripts/pdftops-noduplex b/scripts/pdftops-noduplex deleted file mode 100755 index 2bc525a..0000000 --- a/scripts/pdftops-noduplex +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -pdftops "$1" "$2" -perl -i~ -pe ' - next unless m/^\%\%BeginResource: procset xpdf /..m/^\%\%EndResource/; - s# /Duplex true def # #; -' "$2" diff --git a/scripts/remoteshell b/scripts/remoteshell new file mode 100755 index 0000000..1be2331 --- /dev/null +++ b/scripts/remoteshell @@ -0,0 +1,91 @@ +#!/usr/bin/perl -- +# Perl wrapper around rsh/remsh to export DISPLAY and run an xterm +# Usage: +# remoteshell hostname [-l remoteuser] + +$rsh= 'ssh'; +$usesh= ''; + +$rsh= shift if $ARGV[0] =~ s/^-r//; +$usesh= shift if $ARGV[0] =~ s/^-s//; + +($remotehost= shift) || die "need hostname\n"; +$remotehost= (gethostbyname($remotehost))[0] || $remotehost; + +if ($ARGV[0] eq '-l') { + shift; + ($remoteuser= shift) || die "need username after -l\n"; + $remoteuser= "-l $remoteuser"; +} elsif (open(H,"$ENV{'HOME'}/.rhosts")) { + while () { + m/^(\S+)\s+(\S+)\s*$/ || next; + if (&canon($1) eq &canon($remotehost)) { + $remoteuser= "-l $2"; + last; + } + } +} + +$_= $ENV{'DISPLAY'}; +m/:/ || die "\$DISPLAY variable format `$_' bad"; +$ENV{'DISPLAY'}= &canon($`).':'.$'; + +sub canon { + local ($h) = @_; + local ($v,@h,@v); + chomp($h= `hostname`) unless length($h); + @h= gethostbyname($h); + return $h unless @h; + @v= gethostbyaddr($h[4],$h[2]); + $v= $v[0]; +# unless ($v =~ m/\./) { +# $v .= '.'; +# $v .= `domainname`; +# $v =~ s/\n$//; +# } + return $v; +} + +open(U,"|$rsh $remotehost $remoteuser perl") + || die "failed to run $rsh: $!"; + +print U <<'END' ; + $_= ; chop; @ar= split(/\0/,$_) if length($_); + $_= ; chop; $ENV{'DISPLAY'}= $_; + $_= ; chop; $usesh= $_; + $host= ; chop($host); + $pcmd= '. .configs/setenvir; echo ok $PATH'; + $pout= `$pcmd`; + $pout =~ m/^ok (\S+)\n$/ || die "pcmd gave `$pout'"; + $ENV{'PATH'}= $1; + open(X,"|xauth nmerge -"); + while () { print X; } + close(X); + $? && die "xauth gave code $?"; + defined($c= fork) || die "fork: $!"; + exit 0 if $c; + close(STDIN); close(STDOUT); + open(STDIN,">.remoteshell-errors") || die "append .remoteshell-errors: $!"; + chmod(0600,".remoteshell-errors"); + close(STDERR); open(STDERR,">&STDOUT"); + if ($usesh eq '') { + exec('close3onwards','xterm','-T',$host,@ar,'-e','.configs/rxprofile'); + } else { + exec('close3onwards',$usesh,'-xc','. .configs/setenvir; exec "$@"','-',@ar); + } + print STDERR "close3onwards: $!\n"; + exit 1; +__END__ +END + +print U join("\0",@ARGV),"\n"; +print U $ENV{'DISPLAY'},"\n"; +print U $usesh,"\n"; +print U $remotehost,"\n"; +print U `xauth nextract - $ENV{'DISPLAY'}`; + +close(U); +$? && die "remoteshell $rsh gave code $?"; + +exit 0; diff --git a/scripts/xloadt b/scripts/xloadt new file mode 100755 index 0000000..a5eaf1b --- /dev/null +++ b/scripts/xloadt @@ -0,0 +1,6 @@ +#!/bin/sh - +hostname="`hostname | sed -e 's/\..*//'`" +xlsclients | egrep \ + '[^ ]* xload -geometry [^ ]* -title '"'xload - $hostname'" \ + >/dev/null && exit 0 +xload -geometry 120x120+20+0 -title "xload - $hostname" diff --git a/scripts/xterm-CT b/scripts/xterm-CT new file mode 100755 index 0000000..15e8d7c --- /dev/null +++ b/scripts/xterm-CT @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +titlebase="$1" +shift +touch "$HOME/.counters/l.$DISPLAY" +newcount=`with-lock-ex -w "$HOME/.counters/l.$DISPLAY" perl -e ' + chdir($ARGV[2]) or die $!; + $tb= unpack("H*",$ARGV[1]); $found=0; + open(X,"v.$ARGV[0]\0") or die $!; + open(Z,">n.$ARGV[0]\0") or die $!; + while () { + if (m/^(\d+) $tb$/o && !$found++) { + $nx= $1+1; + } else { + print Z "$_" or die $!; + } + } + if (!defined($nx)) { $nx= 1; } + print Z "$nx $tb\n" or die $!; + close(Z) or die $!; + rename("n.$ARGV[0]","v.$ARGV[0]") or die $!; + print "$nx\n"; +' "$DISPLAY" "$titlebase" "$HOME/.counters"` +exec xterm -T "$titlebase"' ['$newcount']' "$@" -- 2.30.2