From fc536f22380e5efdebeba3267a6fd98e1531566c Mon Sep 17 00:00:00 2001
From: Vincent Esposito <espov@slac.stanford.edu>
Date: Mon, 26 Sep 2022 19:11:22 -0700
Subject: [PATCH 1/5] personalization

---
 on_site/bash_aliases   | 35 ++++++++++++++++++++++++++++++++++-
 on_site/bash_functions |  6 ++++++
 on_site/bashrc         | 14 +++++++++++++-
 vimrc                  |  2 +-
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/on_site/bash_aliases b/on_site/bash_aliases
index de94e95..f40fb62 100644
--- a/on_site/bash_aliases
+++ b/on_site/bash_aliases
@@ -11,7 +11,7 @@ alias ls='ls --color'
 alias l='ls'
 
 # "ll" is short for detailed file lists, with "ls -l":
-alias ll='ls -al'
+alias ll='ls -lh'
 
 # "lh" is short for detailed file lists with human-readable units:
 alias lh='ls -Alh'
@@ -48,6 +48,11 @@ alias cdnewest='cd `ls -td --color=never */ | head -1`'
 #   This shortcut ``psb`` will allow you to quickly go to that host while
 #   retaining your current working directory.
 alias psb='sshcd psbuild-rhel7'
+alias psb5='sshcd psbuild-rhel5'
+alias psd='sshcd psdev'
+alias xppc='ssh -X xppopr@xpp-control'
+alias xppd='ssh -X xppopr@xpp-daq'
+alias mfxd='ssh -X mfxopr@mfx-daq'
 
 # *****************************
 # ** Python and hutch-python **
@@ -63,6 +68,19 @@ alias mfx3="hpy3 mfx"
 alias cxi3="hpy3 cxi"
 alias mec3="hpy3 mec"
 
+# Dir shrortcuts
+alias anad='cd /cds/data/psdm/'
+alias ffbd='cd /cds/data/drpsrcf/'
+alias hpyd='cd /cds/group/pcds/pyps/apps/hutch-python/'
+alias mydev='cd /cds/group/pcds/epics-dev/espov'
+alias epd='cd /cds/group/pcds/epics/'
+alias daqd='cd /cds/group/pcds/dist/pds'
+alias daqlogs='/cds/group/pcds/pds/'
+alias screens='cd /cds/group/pcds/epics-dev/screens/'
+alias epicsd='cd /cds/group/pcds/epics/ioc/'
+alias smd_release='cd /cds/group/psdm/sw/tools/smalldata_tools'
+
+
 # Python 3 hutch python shortcuts
 # hpy3
 #   Quickly start a hutch-python session for a given hutch with ``hpy3 (hutchname)``
@@ -100,3 +118,18 @@ alias cagetstring='caget -S'
 # The tool shellcheck is available in our pcds Python environment.
 #
 # For bash help, see https://tldp.org/LDP/Bash-Beginners-Guide/html/
+
+# file alias
+alias xppcnf='vim /cds/group/pcds/dist/pds/xpp/scripts/xpp.cnf'
+alias mfxcnf='vim /cds/group/pcds/dist/pds/mfx/scripts/mfx.cnf'
+
+# plg prog rdesktop
+alias plcprog='rdesktop -g 1920x1200 -u ${USER} plcprog-console'
+alias plcprog4k='rdesktop -g 3600x2000 -u ${USER} plcprog-console'
+
+# Env aliases
+alias pcdsconda='source pcds_conda'
+alias anaenvpy2='source /reg/g/psdm/etc/psconda.sh'
+alias anaenv='source /reg/g/psdm/etc/psconda.sh -py3'
+alias xppenv='source /cds/group/pcds/pyps/apps/hutch-python/xpp/xppenv'
+
diff --git a/on_site/bash_functions b/on_site/bash_functions
index 9a05d3d..16d9c80 100644
--- a/on_site/bash_functions
+++ b/on_site/bash_functions
@@ -301,3 +301,9 @@ helpme() {
 # The tool shellcheck is available in our pcds Python environment.
 #
 # For bash help, see https://tldp.org/LDP/Bash-Beginners-Guide/html/
+
+function pvgrep()
+{
+grep $1 /reg/d/iocData/*/iocInfo/IOC.pvlist
+}
+
diff --git a/on_site/bashrc b/on_site/bashrc
index f1d1358..fc2f9e6 100644
--- a/on_site/bashrc
+++ b/on_site/bashrc
@@ -14,7 +14,7 @@ if [ -z "$dotfiles" ]; then
 fi
 
 # The following sets up your prompt to show at least the host
-export PS1='\[\e[0;31m\][\u@\h  \W]\$\[\e[m\] '
+export PS1='\[\e[0;32m\][\u@\h  \W]\$\[\e[m\] '
 export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
 
 # Your default editor will be set to vim.
@@ -83,6 +83,18 @@ source /cds/group/pcds/setup/epicsenv-cur.sh
 # Or read-write-execute for you and your group, and just read-execute for all
 # others.
 
+if [ $(echo $HOSTNAME | grep -ic -e "psana" -e "mon0" -e "drp-srcf") -eq 1 ]
+then
+    source /reg/g/psdm/etc/psconda.sh -py3 &> /dev/null
+elif [ $(echo $HOSTNAME | grep -ic -e "xpp") -eq 1 ]
+then
+    export PATH=$PATH:/cds/home/opr/xppopr/bin
+elif [ $(echo $HOSTNAME | grep -ic -e "mfx") -eq 1 ]
+then
+    export PATH=$PATH:/cds/home/opr/mfxopr/bin
+fi
+
+
 # ********************
 # ** Tab completion **
 # ********************
diff --git a/vimrc b/vimrc
index f0d3b28..df2f85a 100644
--- a/vimrc
+++ b/vimrc
@@ -28,7 +28,7 @@ set ignorecase smartcase               " case-insensitive (ic) search by default
                                        " except: if you search for AStringLikeThis, it will be case sensitive
 set imdisable                          " Disable the IME (gvim and unicode don't play well on different locale)
 set incsearch                          " do incremental searching
-set mouse+=a                           " enable mouse mode (terminal dependent)
+" set mouse+=a                           " enable mouse mode (terminal dependent) commented: messes with copy in mobaXterm
 set nobackup                           " disable writing .bak
 set novb                               " ** visual bell, no beeping! **
 set number                             " line numbering

From 76e0a373a53116053997b21d4e07098d2e423974 Mon Sep 17 00:00:00 2001
From: Vincent Esposito <espov@slac.stanford.edu>
Date: Wed, 8 Mar 2023 13:36:59 -0800
Subject: [PATCH 2/5] ENH: Add new alias for personal conda env

---
 on_site/bash_aliases | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/on_site/bash_aliases b/on_site/bash_aliases
index f40fb62..27adece 100644
--- a/on_site/bash_aliases
+++ b/on_site/bash_aliases
@@ -132,4 +132,4 @@ alias pcdsconda='source pcds_conda'
 alias anaenvpy2='source /reg/g/psdm/etc/psconda.sh'
 alias anaenv='source /reg/g/psdm/etc/psconda.sh -py3'
 alias xppenv='source /cds/group/pcds/pyps/apps/hutch-python/xpp/xppenv'
-
+alias myconda='source /cds/home/e/espov/miniconda3/etc/profile.d/conda.sh'

From 7304fda8d6fcaa4d10cbfcccee252ecdd490c19f Mon Sep 17 00:00:00 2001
From: Vincent Esposito <espov@slac.stanford.edu>
Date: Thu, 13 Jul 2023 14:29:08 -0700
Subject: [PATCH 3/5] update

---
 on_site/bash_aliases | 8 ++++++++
 on_site/bashrc       | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/on_site/bash_aliases b/on_site/bash_aliases
index 27adece..7f16dc2 100644
--- a/on_site/bash_aliases
+++ b/on_site/bash_aliases
@@ -53,6 +53,7 @@ alias psd='sshcd psdev'
 alias xppc='ssh -X xppopr@xpp-control'
 alias xppd='ssh -X xppopr@xpp-daq'
 alias mfxd='ssh -X mfxopr@mfx-daq'
+alias tos3df='ssh -J espov@s3dflogin.slac.stanford.edu psana'
 
 # *****************************
 # ** Python and hutch-python **
@@ -133,3 +134,10 @@ alias anaenvpy2='source /reg/g/psdm/etc/psconda.sh'
 alias anaenv='source /reg/g/psdm/etc/psconda.sh -py3'
 alias xppenv='source /cds/group/pcds/pyps/apps/hutch-python/xpp/xppenv'
 alias myconda='source /cds/home/e/espov/miniconda3/etc/profile.d/conda.sh'
+alias ami2env='source /cds/group/pcds/dist/pds/ami2-devel/setup_env_lcls1.sh'
+
+# Path alias
+alias add_pwd_to_python='export PYTHONPATH=$PWD'
+
+# Custom commands aliases
+alias myiftop='sudo iftop -m 1G'
diff --git a/on_site/bashrc b/on_site/bashrc
index ad9112e..0a9789e 100644
--- a/on_site/bashrc
+++ b/on_site/bashrc
@@ -99,6 +99,8 @@ source /cds/group/pcds/setup/epicsenv-cur.sh
 # Or read-write-execute for you and your group, and just read-execute for all
 # others.
 
+export PATH=$PATH:/cds/home/e/espov/bin
+
 if [ $(echo $HOSTNAME | grep -ic -e "psana" -e "mon0" -e "drp-srcf") -eq 1 ]
 then
     source /reg/g/psdm/etc/psconda.sh -py3 &> /dev/null
@@ -232,7 +234,7 @@ esac
 # ``pathmunge`` is a utility which will modify your PATH.  It adds a path
 # to the beginning of the variable PATH, which is where your shell looks for
 # executables and scripts.
-pathmunge /reg/common/tools/bin
+pathmunge /cds/sw/tools/bin
 # /reg/common/tools/bin contains scripts such as:
 #  * Tools for inspecting or interacting with released EPICS modules:
 #     - epics-checkout
@@ -245,7 +247,7 @@ pathmunge /reg/common/tools/bin
 #     - digiconfig
 #     - psipmi
 
-pathmunge /reg/g/pcds/engineering_tools/latest-released/scripts
+pathmunge /cds/group/pcds/engineering_tools/latest-released/scripts
 # /reg/g/pcds/engineering_tools/latest-released/scripts
 #  * General tools of use to ECS engineers
 #    For documentation, see: https://github.com/pcdshub/engineering_tools

From 54eec0f50333b8cd4e02268b983c6df82ede2352 Mon Sep 17 00:00:00 2001
From: Vincent Esposito <espov@slac.stanford.edu>
Date: Thu, 13 Jul 2023 15:21:14 -0700
Subject: [PATCH 4/5] fix reg vs cds

---
 on_site/bashrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/on_site/bashrc b/on_site/bashrc
index 0a9789e..ece2035 100644
--- a/on_site/bashrc
+++ b/on_site/bashrc
@@ -351,6 +351,9 @@ if [ -n "${THIS_HOST}" ]; then
     fi
 fi
 
+# clean up tools path. It should be /cds/sw/tools/bin (added above)
+pathpurge /reg/common/tools/bin
+
 # ***************
 # ** Now what? **
 # ***************

From b2b573a455b12a44fab1e9fc9f01df70492c5a1c Mon Sep 17 00:00:00 2001
From: Vincent Esposito <espov@slac.stanford.edu>
Date: Mon, 10 Mar 2025 20:59:52 -0700
Subject: [PATCH 5/5] more aliases, remove bad default vim color

---
 on_site/bash_aliases | 10 +++++++---
 vimrc                |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/on_site/bash_aliases b/on_site/bash_aliases
index 7f16dc2..fdda64c 100644
--- a/on_site/bash_aliases
+++ b/on_site/bash_aliases
@@ -53,7 +53,8 @@ alias psd='sshcd psdev'
 alias xppc='ssh -X xppopr@xpp-control'
 alias xppd='ssh -X xppopr@xpp-daq'
 alias mfxd='ssh -X mfxopr@mfx-daq'
-alias tos3df='ssh -J espov@s3dflogin.slac.stanford.edu psana'
+#alias tos3df='ssh -J espov@s3dflogin.slac.stanford.edu psana'
+alias tos3df='ssh espov@s3dflogin.slac.stanford.edu'
 
 # *****************************
 # ** Python and hutch-python **
@@ -78,7 +79,7 @@ alias epd='cd /cds/group/pcds/epics/'
 alias daqd='cd /cds/group/pcds/dist/pds'
 alias daqlogs='/cds/group/pcds/pds/'
 alias screens='cd /cds/group/pcds/epics-dev/screens/'
-alias epicsd='cd /cds/group/pcds/epics/ioc/'
+alias iocd='cd /cds/group/pcds/epics/ioc/'
 alias smd_release='cd /cds/group/psdm/sw/tools/smalldata_tools'
 
 
@@ -123,9 +124,11 @@ alias cagetstring='caget -S'
 # file alias
 alias xppcnf='vim /cds/group/pcds/dist/pds/xpp/scripts/xpp.cnf'
 alias mfxcnf='vim /cds/group/pcds/dist/pds/mfx/scripts/mfx.cnf'
+alias cxicnf='vim /cds/group/pcds/dist/pds/cxi/scripts/cxi_0.cnf'
 
 # plg prog rdesktop
-alias plcprog='rdesktop -g 1920x1200 -u ${USER} plcprog-console'
+#alias plcprog='rdesktop -g 1920x1200 -u ${USER} plcprog-console'
+alias plcprog='xfreerdp -g 1920x1200 -u ${USER} plcprog-console'
 alias plcprog4k='rdesktop -g 3600x2000 -u ${USER} plcprog-console'
 
 # Env aliases
@@ -141,3 +144,4 @@ alias add_pwd_to_python='export PYTHONPATH=$PWD'
 
 # Custom commands aliases
 alias myiftop='sudo iftop -m 1G'
+alias swtool='/cds/group/pcds/pyps/apps/switchtool/latest/switchtool'
diff --git a/vimrc b/vimrc
index df2f85a..319273e 100644
--- a/vimrc
+++ b/vimrc
@@ -46,10 +46,10 @@ set wrap                               " wrap text at the end of your screen (->
 set wildignore+=*/tmp/*,*.so,*.swp,*.zip
 set wildignore+=*\\tmp\\*,*.exe
 
-if has('termguicolors')
-  " Depending on your terminal, you might get 24-bit color support
-  set termguicolors
-endif
+"if has('termguicolors')
+"  " Depending on your terminal, you might get 24-bit color support
+"  set termguicolors
+"endif
 
 if !has('nvim') && &term =~ '^screen'
     " tmux knows the extended mouse mode