opt to use original bag setups
diff --git a/workspace_setup/.bashrc b/workspace_setup/.bashrc
index 08c470c..4102773 100644
--- a/workspace_setup/.bashrc
+++ b/workspace_setup/.bashrc
@@ -1,62 +1,74 @@
#! /usr/bin/env bash
-export PYTHONPATH=""
### Setup BAG
+export BAG_TOOLS_ROOT=/tools/bag3/core
source .bashrc_bag
-export PDK_HOME=/tools/commercial/skywater/swtech130/skywater-src-nda/s8/V2.0.0
-export SW_PDK_ROOT=/tools/commercial/skywater
-export SW_IP_HOME=${SW_PDK_ROOT}/s8_ip
-export METAL_STACK="s8phirs_10r"
+# PDK specific stuff
+export SW_PDK_ROOT=${BAG_TECH_CONFIG_DIR}/workspace_setup/PDK_root
+export PDK_HOME=${BAG_TECH_CONFIG_DIR}/workspace_setup/PDK
+export METAL_STACK=s8phirs_10r
+# calibre setup
+export MGLS_LICENSE_FILE=5282@login1.bcanalog.com
+export MGC_HOME=/tools/mentor/aoi_cal_2018.1_27.18
+export MGLS_HOME=/tools/mentor/mgls
+export CALIBRE_HOME=$MGC_HOME
# location of various tools
-export MGC_HOME=/tools/mentor/calibre/current
-export CDS_INST_DIR=/tools/cadence/ICADVM/ICADVM181
-export PVS_HOME=/tools/cadence/PVS/PVS151
-export SPECTRE_HOME=/tools/cadence/SPECTRE/SPECTRE181_ISR7
-export QRC_HOME=/tools/cadence/EXT/EXT191_ISR3
-export SRR_HOME=/tools/cadence/SRR/SRR_0618
-export CMAKE_HOME=/tools/B/ayan_biswas/programs/cmake-3.17.0-Linux-x86_64
+export CDS_INST_DIR=/tools/cadence/IC618
+export PEGASUS_HOME=/tools/cadence/PEGASUS184
+export SRR_HOME=/tools/cadence/SRR
+# export CDS_INST_DIR=/tools/cadence/IC618
+export SPECTRE_HOME=/tools/cadence/SPECTRE181
+export QRC_HOME=/tools/cadence/EXT191
+export INNOVUSHOME=/tools/cadence/installs/INNOVUS181
+export CDSLIB_HOME=/tools/bag3/programs/cdsLibPlugin
+export LATEX_BIN=/tools/texlive/2019/bin/x86_64-linux
-export CDSHOME=${CDS_INST_DIR}
+export CDSHOME=$CDS_INST_DIR
+export CDSLIB_TOOL=${CDSLIB_HOME}/tools.lnx86
export MMSIM_HOME=${SPECTRE_HOME}
# OA settings
-export OA_SRC_ROOT=/tools/B/ayan_biswas/programs/oa_new
-export OA_LINK_DIR=${OA_SRC_ROOT}/lib/linux_rhel70_gcc83x_64/opt
+export OA_SRC_ROOT=/tools/bag3/programs/oa_22d6
+export OA_LINK_DIR=${OA_SRC_ROOT}/lib/linux_rhel60_64/opt
+# export OA_LINK_DIR=${OA_SRC_ROOT}/lib/linux_rhel50_gcc48x_64/opt
+export OA_CDS_ROOT=${CDS_INST_DIR}/oa_v22.60.007
export OA_INCLUDE_DIR=${OA_SRC_ROOT}/include
-export OA_CDS_ROOT=${CDS_INST_DIR}/oa_v22.60.s007
-export OA_PLUGIN_PATH=${OA_CDS_ROOT}/data/plugins:${OA_PLUGIN_PATH:-}
+export OA_PLUGIN_PATH=${CDSLIB_HOME}/share/oaPlugIns:${OA_CDS_ROOT}/data/plugins:${OA_PLUGIN_PATH:-}
export OA_BIT=64
# PATH setup
-export PATH=${MGC_HOME}/bin:${PATH}
-export PATH=${PVS_HOME}/bin:${PATH}
-export PATH=${QRC_HOME}/bin:${PATH}
+export PATH=${MGLS_HOME}/bin:${PATH}
+export PATH=${CALIBRE_HOME}/bin:${PATH}
+export PATH=${CDSLIB_TOOL}/bin:${PATH}
+export PATH=${PEGASUS_HOME}/bin:${PATH}
export PATH=${CDS_INST_DIR}/tools/plot/bin:${PATH}
export PATH=${CDS_INST_DIR}/tools/dfII/bin:${PATH}
export PATH=${CDS_INST_DIR}/tools/bin:${PATH}
export PATH=${MMSIM_HOME}/bin:${PATH}
+export PATH=${QRC_HOME}/bin:${PATH}
+export PATH=${LATEX_BIN}:${PATH}
export PATH=${BAG_TOOLS_ROOT}/bin:${PATH}
-export PATH=${CMAKE_HOME}/bin:${PATH}
-export PATH=/tools/B/ayan_biswas/programs/core/bin:${PATH}
# LD_LIBRARY_PATH setup
+export LD_LIBRARY_PATH=${CDSLIB_TOOL}/lib/64bit:${LD_LIBRARY_PATH:-}
export LD_LIBRARY_PATH=${OA_LINK_DIR}:${LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH=${BAG_WORK_DIR}/cadence_libs:${LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH=${SRR_HOME}/tools/lib/64bit:${LD_LIBRARY_PATH:-}
+export LD_LIBRARY_PATH=${BAG_TOOLS_ROOT}/lib64:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=${BAG_TOOLS_ROOT}/lib:${LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH=$/tools/B/ayan_biswas/programs/core/lib:${LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH=$/tools/B/ayan_biswas/programs/core/lib64:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=${SRR_HOME}/tools/lib/64bit:${LD_LIBRARY_PATH}
# Virtuoso options
export SPECTRE_DEFAULTS=-E
export CDS_Netlisting_Mode="Analog"
export CDS_AUTO_64BIT=ALL
-
-# License setup
-source /tools/flexlm/flexlm.sh
+export CDS_LIC_FILE=5280@login1.bcanalog.com
# pybag compiler settings
export CMAKE_PREFIX_PATH=${BAG_TOOLS_ROOT}
+export HDF5_PLUGIN_PATH=${BAG_TOOLS_ROOT}/lib/hdf5/plugin
+
+# clear out PYTHONPATH
+export PYTHONPATH=""
+export PYTHONPATH_CUSTOM=${SRR_HOME}/tools/srrpython
diff --git a/workspace_setup/.bashrc_bag b/workspace_setup/.bashrc_bag
index 414a39c..01a90fc 100644
--- a/workspace_setup/.bashrc_bag
+++ b/workspace_setup/.bashrc_bag
@@ -1,15 +1,14 @@
#! /usr/bin/env bash
-#set directory variables
+# set directory variables
export BAG_WORK_DIR=$(pwd)
-#set location of BAG tools
-export BAG_TOOLS_ROOT=/tools/commercial/bcanalog/bag/bag3d0_rhel60_64
export BAG_FRAMEWORK=${BAG_WORK_DIR}/BAG_framework
export BAG_TECH_CONFIG_DIR=${BAG_WORK_DIR}/skywater130
-export BAG_TEMP_DIR=/tools/scratch/${USER}/BAGTMP
+export BAG_TEMP_DIR=${BAG_WORK_DIR}/BAGTMP
export IPYTHONDIR=${BAG_WORK_DIR}/.ipython
# disable hash-salting. We need stable hashing across sessions for caching purposes.
export PYTHONHASHSEED=0
+
# set program locations
export BAG_PYTHON=${BAG_TOOLS_ROOT}/bin/python3
export BAG_JUPYTER=${BAG_TOOLS_ROOT}/bin/jupyter-notebook
diff --git a/workspace_setup/ipython_config.py b/workspace_setup/ipython_config.py
index b53ec95..a4a9cfb 100644
--- a/workspace_setup/ipython_config.py
+++ b/workspace_setup/ipython_config.py
@@ -1,9 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
# Copyright 2019-2021 SkyWater PDK Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
