Mercurial > hg > cc > cirrus_home
changeset 83:8fb11e337e23
environment improvements
| author | Henry S. Thompson <ht@inf.ed.ac.uk> |
|---|---|
| date | Sun, 14 Mar 2021 21:25:01 +0000 |
| parents | 6304d5c46229 |
| children | 2fc33145242b |
| files | .Xauthority .bashrc .emacs .hgignore .screenrc .xemacs/custom.el .xemacs/init.el |
| diffstat | 7 files changed, 93 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/.bashrc Wed Mar 03 19:33:56 2021 +0000 +++ b/.bashrc Sun Mar 14 21:25:01 2021 +0000 @@ -1,18 +1,69 @@ # .bashrc -# Source global definitions -if [ -f /etc/bashrc ]; then - . /etc/bashrc -fi - # Uncomment the following line if you don't like systemctl's auto-paging feature: # export SYSTEMD_PAGER= +if [ $SHELL = "/bin/bash" ] +then + # Source global definitions + if [ -f /etc/bashrc ]; then + . /etc/bashrc + fi + + if [ "$PS1" ]; then + PS1='\[\033[1m\]\h\[\033[0m\]<\!>: ' + echo "Vanilla bashrc" 1>&2 + # don't put duplicate lines or lines starting with space in the history. + # See bash(1) for more options + # export HISTCONTROL=ignoreboth [readonly on Cirrus :-[ + + # append to the history file, don't overwrite it + shopt -s histappend + + # for setting history length see HISTSIZE and HISTFILESIZE in bash(1) + # export HISTSIZE=3000 [readonly on Cirrus :-[ + export HISTFILESIZE=6000 + fi + + module load gcc # assumed by Prefix + + export PYTHONPATH=$HOME/lib/python3.6/site-packages + + PATH="/lustre/home/dc007/hst/lib/perl5/bin${PATH:+:${PATH}}"; export PATH; + PERL5LIB="/lustre/home/dc007/hst/lib/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; + PERL_LOCAL_LIB_ROOT="/lustre/home/dc007/hst/lib/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; + PERL_MB_OPT="--install_base \"/lustre/home/dc007/hst/lib/perl5\""; export PERL_MB_OPT; + PERL_MM_OPT="INSTALL_BASE=/lustre/home/dc007/hst/lib/perl5"; export PERL_MM_OPT; + + export ANT_HOME=$HOME/src/apache-ant-1.10.7 + export MAVEN_HOME=$HOME/src/apache-maven-3.6.3 + export JAVA_HOME=$HOME/lib/openjdk-8u252-b09 + export PATH=${PATH}:${ANT_HOME}/bin:${MAVEN_HOME}/bin + +else + if [ "$PS1" ]; then + echo "~/.bashrc inside gentoo" 1>&2 + PS1='\[\e[1;32m\]\h\[\e[0m\]<\!>: ' + # Source some global definitions? + + # These are readonly under Cirrus, so repeated here where they work1 + export HISTCONTROL=ignoreboth + export HISTSIZE=3000 + export HISTFILESIZE=6000 + shopt -s histappend + + if [ "$DISPLAY" ] + then + xrdb $HOME/.Xresources + fi + fi +fi + # User specific aliases and functions -module add gnu-parallel -export N1=rli4n35 -export N2=rli6n35 -export NN="$N1 $N2" +#module add gnu-parallel +#export N1=rli4n35 +#export N2=rli6n35 +#export NN="$N1 $N2" # Tools function lss() { @@ -38,6 +89,8 @@ ' } +function uz () { unpigz -dp 1 -c "$@" ; } + function typecat () { tt=$(type $1) @@ -47,21 +100,9 @@ *) type $1 ;; esac } -export HISTSIZE=3000 -export PYTHONPATH=$HOME/lib/python3.6/site-packages - -PATH="/lustre/home/dc007/hst/lib/perl5/bin${PATH:+:${PATH}}"; export PATH; -PERL5LIB="/lustre/home/dc007/hst/lib/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT="/lustre/home/dc007/hst/lib/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; -PERL_MB_OPT="--install_base \"/lustre/home/dc007/hst/lib/perl5\""; export PERL_MB_OPT; -PERL_MM_OPT="INSTALL_BASE=/lustre/home/dc007/hst/lib/perl5"; export PERL_MM_OPT; +#export HISTSIZE=3000 PATH=$PATH:$HOME/.local/bin:$HOME/bin EDITOR=emacs -export PATH EDITOR - -export ANT_HOME=$HOME/src/apache-ant-1.10.7 -export MAVEN_HOME=$HOME/src/apache-maven-3.6.3 -export JAVA_HOME=$HOME/lib/openjdk-8u252-b09 -export PATH=${PATH}:${ANT_HOME}/bin:${MAVEN_HOME}/bin +export PATH EDITOR PS1
--- a/.emacs Wed Mar 03 19:33:56 2021 +0000 +++ b/.emacs Sun Mar 14 21:25:01 2021 +0000 @@ -21,3 +21,4 @@ (unless (server-running-p) (server-start)) (put 'narrow-to-region 'disabled nil) +(setq load-home-init-file t) ; don't load init file from ~/.xemacs/init.el
--- a/.hgignore Wed Mar 03 19:33:56 2021 +0000 +++ b/.hgignore Sun Mar 14 21:25:01 2021 +0000 @@ -54,3 +54,4 @@ nutch-cc src/hadoop .Xauthority +gentoo
--- a/.screenrc Wed Mar 03 19:33:56 2021 +0000 +++ b/.screenrc Sun Mar 14 21:25:01 2021 +0000 @@ -1,2 +1,1 @@ -terminfo xterm* ti=:te= -altscreen +altscreen on
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.xemacs/custom.el Sun Mar 14 21:25:01 2021 +0000 @@ -0,0 +1,17 @@ +(message "custom 0") +(custom-set-variables + '(gnus-use-toolbar nil) + '(message-use-toolbar nil t) + '(toolbar-mail-reader 'gnus) + '(toolbar-news-reader 'gnus) + '(toolbar-visible-p nil) + '(package-get-dir "C:\\C64\\tmp") + '(gutter-buffers-tab-visible-p nil) + '(progress-feedback-use-echo-area t) + '(recent-files-dont-include '("semantic.cache")) + '(semantic-idle-scheduler-work-idle-time 600) + '(sgml-general-insert-case 'upper) + '(efs-generate-anonymous-password "ht@inf.ed.ac.uk")) +(message "custom 1") +(custom-set-faces) +(message "custom 2")
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.xemacs/init.el Sun Mar 14 21:25:01 2021 +0000 @@ -0,0 +1,9 @@ +(message "init 0") +(defvar site-name 'cirrus "for site-specific initialisation") +(message "init 1") +(load "~/lib/emacs/common-init" nil t) +(message "init 2") +(load "~/lib/emacs/pers-init" nil t) +(message "init 3") +(nconc load-path '("/lustre/home/dc007/hst/gentoo/usr/lib/xemacs/xemacs-packages/lisp/prog-modes" "/lustre/home/dc007/hst/gentoo/usr/lib/xemacs/xemacs-packages/lisp/python-modes" "/lustre/home/dc007/hst/gentoo/usr/lib/xemacs/xemacs-packages/lisp/xemacs-base" "/lustre/home/dc007/hst/gentoo/usr/lib/xemacs/xemacs-packages/lisp/text-modes" "/lustre/home/dc007/hst/gentoo/usr/lib/xemacs/xemacs-packages/lisp/edit-utils" "/lustre/home/dc007/hst/gentoo/usr/lib/xemacs/xemacs-packages/lisp/fsf-compat" "/lustre/home/dc007/hst/gentoo/usr/lib/xemacs/xemacs-packages/lisp/sh-script")) +