update merge r115:HEAD changes

diff --git a/.Xresources_volo b/.Xresources_volo
new file mode 100644 (file)
index 0000000..9d6c113
--- /dev/null
+++ b/.Xresources_volo
@@ -0,0 +1,15 @@
+;;-*- mode: xrdb; -*-
+    emacs*font: -misc-fixed-medium-r-*-*-15-*-*-*-*-*-*-*
+emacs*geometry: 155x56
+
+       UXTerm*geometry: 159x58
+     UXTerm*utf-8*font: -misc-fixed-medium-r-*-*-15-*-*-*-*-*-iso10646-1
+     UXTerm*VT100*font: -misc-fixed-medium-r-*-*-15-*-*-*-*-*-*-*
+UXTerm*metaSendsEscape: true
+
+  URxvt.geometry: 159x58
+      URxvt.font: 9x15
+URxvt.background: black
+URxvt.foreground: gray90
+
+xpdf*geometry: 1152x740

diff --git a/.bashrc b/.bashrc
index 6222be40d9857afeb3b1d9547ac5ec7ff277568e..c2d1b0919936d91f5fdbc9cfc081b2641be3cc76 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -29,7 +29,8 @@ if [ "$PS1" ]; then
     alias emc='sane_editor'
 
     # set a fancy prompt
     alias emc='sane_editor'
 
     # set a fancy prompt

-    PS1='\u@\h:\w\$ '
+    PS1="\[\033[0;36m\]\h \t \w$\[\033[0m\] "
+    # \[\033[1;36m\][\w]\n\[\033[0;36m\][\h|\t]$ \[\033[0m\]

 
     # If this is an xterm set the title to user@host:dir
     #case $TERM in
 
     # If this is an xterm set the title to user@host:dir
     #case $TERM in


@@ -49,6 +50,14 @@ if [ "$PS1" ]; then
     alias aumix2='aumix -d /dev/mixer1 -I'
     export LANG="en_US.UTF-8"
     export PATH="~/bin:$PATH"
     alias aumix2='aumix -d /dev/mixer1 -I'
     export LANG="en_US.UTF-8"
     export PATH="~/bin:$PATH"

+    if [ ! -e ~/tmp ]; then
+       mkdir ~/tmp;
+    fi;
+    export TMPDIR="$(echo ~/tmp)";
+
+    for a in tda tdd tde; do
+       alias "s${a}"="STODO_NO_COMMIT=1 $a"
+    done;

 
     TODO_OPTIONS="--timeout --summary"
 
 
     TODO_OPTIONS="--timeout --summary"
 

diff --git a/.bzr.conf/email b/.bzr.conf/email
new file mode 100644 (file)
index 0000000..a59b2be
--- /dev/null
+++ b/.bzr.conf/email
@@ -0,0 +1 @@
+don@donarmstrong.com

diff --git a/.cgobanrc b/.cgobanrc
new file mode 100644 (file)
index 0000000..dda9996
--- /dev/null
+++ b/.cgobanrc
@@ -0,0 +1,117 @@
+# NOTICE: Please do not edit this file.
+# It was automatically generated by "cgoban".  If you want to
+#   change one of these values, please use command line switches,
+#   X defaults, or a setup window.
+# As a last resort you may simply delete this file.
+
+cgoban.VersionNumber: 1.9.14
+cgoban.stealth: t
+cgoban.hiContrast: f
+cgoban.name: cgoban
+cgoban.fontHeight: 12
+cgoban.arena.prog1: 
+cgoban.arena.prog2: 
+cgoban.arena.size: 19
+cgoban.arena.komi: 5.5
+cgoban.arena.handicap: 0
+cgoban.play.markLastMove: t
+cgoban.play.markHotStones: t
+cgoban.board.showCoords: t
+cgoban.control.x: 796
+cgoban.control.y: 531
+cgoban.help.x: 
+cgoban.help.y: 
+cgoban.help.w: 28.284271
+cgoban.help.h: 40.0
+cgoban.game.rules: 1
+cgoban.game.size: 19
+cgoban.game.komi: 5.500000
+cgoban.game.handicap: 0
+cgoban.local.wName: White
+cgoban.local.bName: Black
+cgoban.local.x: 1875
+cgoban.local.y: 219
+cgoban.local.bProp: 1.738007
+cgoban.local.bPropW: 1.738007
+cgoban.local.sgfName: game.sgf
+cgoban.edit.x: 2537
+cgoban.edit.y: 317
+cgoban.edit.toolX: 2250
+cgoban.edit.toolY: 925
+cgoban.edit.toolW: 21.142857
+cgoban.edit.toolH: 14.928571
+cgoban.edit.bProp: 1.000000
+cgoban.edit.bPropW: 1.000000
+cgoban.edit.sgfName: seigen-minoru.sgf
+cgoban.edit.infoX: 
+cgoban.edit.infoY: 
+cgoban.edit.infoW: 1.0
+cgoban.edit.infoH: 1.0
+cgoban.setup.timeType: 2
+cgoban.setup.mainTime: 30:00
+cgoban.setup.igsBYTime: 1:00
+cgoban.setup.igsBYStones: 5
+cgoban.setup.ingBYTime: 15:00
+cgoban.setup.ingBYPeriods: 3
+cgoban.setup.jBYTime: 1:00
+cgoban.setup.jBYPeriods: 5
+cgoban.config.x: 622
+cgoban.config.y: 866
+cgoban.config.h: 0.707386
+cgoban.gmp.WOption: 2
+cgoban.gmp.BOption: 0
+cgoban.gmp.WProgram: /usr/games/gnugo --mode gmp --quiet
+cgoban.gmp.BProgram: /usr/games/gnugo --mode gmp --quiet
+cgoban.gmp.WDevice: /dev/ttyS0
+cgoban.gmp.BDevice: /dev/ttyS1
+cgoban.gmp.machine: localhost
+cgoban.gmp.port: 26276
+cgoban.gmp.nngs.username: 
+cgoban.gmp.nngs.password: 
+cgoban.gmp.igs.username: 
+cgoban.gmp.igs.password: 
+cgoban.client.def1: 0
+cgoban.client.def2: 1
+cgoban.client.server: NNGS|IGS|LGS|NCIC|GIGS|||||
+cgoban.client.protocol: n|i|n|n|n|n|n|n|n|n
+cgoban.client.direct: t|t|t|t|t|t|t|t|t|t
+cgoban.client.connCmd: telnet nngs.cosmic.org 9696|telnet igs.joyjoy.net 6969|telnet|telnet|telnet|telnet|telnet|telnet|telnet|telnet
+cgoban.client.username: |||||||||
+cgoban.client.password: |||||||||
+cgoban.client.address: nngs.cosmic.org|igs.joyjoy.net|micro.ee.nthu.edu.tw|jet.ncic.ac.cn|grizu.uni-regensburg.de|||||
+cgoban.client.port: 9696|6969|9696|9696|9696|9696|9696|9696|9696|9696
+cgoban.client.match.meFirst: t
+cgoban.client.match.size: 19
+cgoban.client.match.free: f
+cgoban.client.match.mainTime: 20:00
+cgoban.client.match.byTime: 10:00
+cgoban.client.match.x: 
+cgoban.client.match.y: 
+cgoban.client.main.x: 
+cgoban.client.main.y: 
+cgoban.client.main.w: 40
+cgoban.client.main.h: 40
+cgoban.client.games.x: 
+cgoban.client.games.y: 
+cgoban.client.games.w: 6
+cgoban.client.games.h2: 0.5
+cgoban.client.players.x: 
+cgoban.client.players.y: 
+cgoban.client.players.h: 30.742
+cgoban.client.players.sort: 0
+cgoban.client.x: 
+cgoban.client.y: 
+cgoban.client.bProp: 1.0
+cgoban.client.bPropW: 1.0
+cgoban.client.numberKibitz: f
+cgoban.client.noTypo: f
+cgoban.client.look.x: 
+cgoban.client.look.y: 
+cgoban.client.look.bProp: 1.0
+cgoban.client.look.bPropW: 1.0
+cgoban.client.saykib: 1
+cgoban.client.warnLimit: 30
+cgoban.abut.fsel.x: 
+cgoban.abut.fsel.y: 
+cgoban.abut.fsel.w: 1.2
+cgoban.abut.fsel.h: 1.2

diff --git a/.emacs b/.emacs
index 24c1962fac9cecfea3039cbb2fe245c209f9b3a2..6c1fc0e2f078f3d6c1fffef52722260be394c27b 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -133,7 +133,7 @@
   (insert (format-time-string "%A, %B %e, %Y %k:%M:%S %Z")))
 (global-set-key "\C-[d" 'insert-date)
 
   (insert (format-time-string "%A, %B %e, %Y %k:%M:%S %Z")))
 (global-set-key "\C-[d" 'insert-date)
 

-(iswitchb-default-keybindings)
+;(iswitchb-default-keybindings)

 
 (column-number-mode t)
 (setq reftex-plug-into-AUCTeX t)
 
 (column-number-mode t)
 (setq reftex-plug-into-AUCTeX t)

diff --git a/.sarc b/.sarc
index beb875aadb1435727a7ac4966cf2e5c2fa345b1b..74472edbfe4d88a6c0c5754b4efa14f54282bf0a 100644 (file)
--- a/.sarc
+++ b/.sarc
@@ -2,4 +2,4 @@
 ~/bin
 ~/lib
 ~/projects
 ~/bin
 ~/lib
 ~/projects

-~/.hide
+~/.hide        ~/bin/svnfix

diff --git a/.screenrc b/.screenrc
new file mode 100644 (file)
index 0000000..b1e590d
--- /dev/null
+++ b/.screenrc
@@ -0,0 +1,2 @@
+startup_message off
+

diff --git a/.ssh/config b/.ssh/config
index 0f5e5aa18d0d53cb79ebcec4863eea395f3f6886..291536a0cf25182b79f734f88b0c4b781f1b3be9 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,5 +1,9 @@
 Host ernst.ucr.edu
   User zido
 Host ernst.ucr.edu
   User zido

+Host volo
+  User don
+  HostKeyAlias volo
+  CheckHostIP no

 Host frogsleap.com
   User frogsleap
 Host *.debian.org
 Host frogsleap.com
   User frogsleap
 Host *.debian.org

diff --git a/.todorc b/.todorc
index 7daf4b7f1453eb1b9c0c41824d9b633fe3687ab1..1168aa57e091092056a48f4c8d10a1af769fd99b 100644 (file)
--- a/.todorc
+++ b/.todorc
@@ -1 +1,5 @@
-timeout 10
\ No newline at end of file
+timeout 10
+on save {
+       verbose
+       exec ~/bin/stodo
+}
\ No newline at end of file

diff --git a/.xsession_volo b/.xsession_volo
new file mode 100644 (file)
index 0000000..7b30865
--- /dev/null
+++ b/.xsession_volo
@@ -0,0 +1,30 @@
+#-*- mode: sh; -*-
+HOSTNAME=$(hostname)
+
+xmodmap -e 'keycode 115 = Multi_key'
+# Return to sane autokey rates (not glacially slow ones)
+xset r rate 250 35
+xmodmap -e 'keysym Alt_L = Meta_L'
+# xmodmap -e 'clear control'
+# xmodmap -e 'add control = Control_L'
+# xmodmap -e 'add mod3 = Control_R'
+
+if [ -x /usr/bin/synclient ]; then
+    synclient RTCornerButton=0 \
+       RBCornerButton=0 \
+       LTCornerButton=0 \
+       LockedDrags=1 \
+       RightEdge=1500;
+fi;
+
+if [ -x /usr/bin/syndaemon ]; then
+    syndaemon -i 1 -t -d
+fi;
+
+if [ -x /usr/bin/gtkpbbuttons ]; then
+    gtkpbbuttons -t Crystal -d;
+fi;
+
+if [ -x /usr/bin/feh ] && [ -r /home/don/media/pictures/shards_of_aleysa.jpg ]; then
+    /usr/bin/feh --bg-scale /home/don/media/pictures/shards_of_aleysa.jpg
+fi;