Merge remote-tracking branch 'origin/master'

3 files changed, 8 insertions, 1 deletions

diff --git a/doom/.DS_Store b/doom/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
--- a/doom/.DS_Store
+++ /dev/null
diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 90463cf..efd4cc1 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -39,6 +39,8 @@ prepend_path "${HOME}/.cabal/bin"
 prepend_path "${HOME}/.local/bin"
 # prepend_path "/usr/local/opt/llvm/bin"
 
+prepend_path "/mnt/data/tools/panda/bambu-9.7-dev/bin"
+
 append_path "/opt/Xilinx/Vivado/2019.1/bin"
 append_path "/opt/intelFPGA_lite/18.1/quartus/bin"
 append_path "$HOME/projects/vericert/bin"
@@ -73,3 +75,8 @@ fi
 
 # Travis
 [ -r "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"
+
+export CDS_LIC_FILE=5280@ee-llic01.ee.ic.ac.uk
+export SNPS_LICENSE_FILE=7182@ee-llic01.ee.ic.ac.uk
+export MGLS_LICENSE_FILE=1717@ee-llic01.ee.ic.ac.uk
+export LM_LICENSE_FILE=2100@ee-llic01.ee.ic.ac.uk:7193@ee-llic01.ee.ic.ac.uk:5280@ee-llic01.ee.ic.ac.uk:7182@ee-llic01.ee.ic.ac.uk:1717@ee-llic01.ee.ic.ac.uk
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a8739a9..157da7d 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -25,7 +25,7 @@ setopt HIST_IGNORE_DUPS
 setopt HIST_IGNORE_SPACE
 setopt HIST_FIND_NO_DUPS
 
-if [ -d ~/.cache/wal ]; then (cat ~/.cache/wal/sequences &) fi
+#if [ -d ~/.cache/wal ]; then (cat ~/.cache/wal/sequences &) fi
 
 export MINIMAL_MAGIC_ENTER=no