# HG changeset patch
# User Henry Thompson <ht@markup.co.uk>
# Date 1692475349 14400
# Node ID 7bbb14f6e3946d2266f44b0adb67005deceba56a
# Parent  e115f2e89af652a1548a5238f430c1bebcd26055# Parent  bf09a1d80d7b98895a5735aae3fe1cb59ca46c01
merge

diff -r e115f2e89af6 -r 7bbb14f6e394 .bash_profile
--- a/.bash_profile	Sat Aug 19 15:58:38 2023 -0400
+++ b/.bash_profile	Sat Aug 19 16:02:29 2023 -0400
@@ -7,3 +7,4 @@
 
 # User specific environment and startup programs
 
+unset MANPATH
diff -r e115f2e89af6 -r 7bbb14f6e394 .bashrc
--- a/.bashrc	Sat Aug 19 15:58:38 2023 -0400
+++ b/.bashrc	Sat Aug 19 16:02:29 2023 -0400
@@ -20,6 +20,8 @@
     echo -ne '\033]0;'${HOSTNAME/-login/} ${PWD/$HOME/w\~}'\007'
 }
 
+PATH=$PATH:$HOME/.local/bin:$HOME/bin
+
 if [ "$PS1" ]; then
   echo "Singularity bash" 1>&2
   # don't put duplicate lines or lines starting with space in the history.
@@ -33,6 +35,21 @@
   export HISTSIZE=3000
   export HISTFILESIZE=6000
   export HISTIGNORE='[ ]*:&:[fb]g:exit'
+
+ # fix $W -> \$W after tab completion
+ shopt -u progcomp
+
+ if [ -d /mnt/lustre/indy2lfs/sw/ ]
+ then
+  # We have access to mounted modules from Cirrus, use anaconda python libs,
+  #  in particular, tkinter for matplotlib
+  export MODULES=/mnt/lustre/indy2lfs/sw
+  export SING=csing
+  export PYTHONPATH=:/usr/lib/python39.zip:/usr/lib/python3.9:/usr/lib/python3.9/lib-dynload:/usr/local/lib/python3.9/dist-packages:/usr/lib/python3/dist-packages
+  PATH=$MODULES/anaconda/anaconda3-2021.11/bin:$PATH
+  export XDG_RUNTIME_DIR=/tmp/runtime-$USER
+ fi
+ 
 fi
 
 EDITOR=xemacs
diff -r e115f2e89af6 -r 7bbb14f6e394 bin/sort_date.py