From 529b22c8a193d1fc8459531a678bdd04759a5c32 Mon Sep 17 00:00:00 2001
From: Marc Henry de Frahan <marc.henrydefrahan@nrel.gov>
Date: Thu, 5 Sep 2024 10:00:25 -0600
Subject: [PATCH] Consolidate module loads

---
 bin/executable_pyenv_python_install.tmpl      |  2 +-
 .../zinit/plugins/hpc/hpc.plugin.zsh.tmpl     | 85 ++++++++++---------
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/bin/executable_pyenv_python_install.tmpl b/bin/executable_pyenv_python_install.tmpl
index 660c1ee..3436002 100644
--- a/bin/executable_pyenv_python_install.tmpl
+++ b/bin/executable_pyenv_python_install.tmpl
@@ -6,7 +6,7 @@ if [[ ! -x "$(command -v pyenv)" ]]; then
 fi
 
 {{- if eq .nrel_cluster "ellis" }}
-MODULES_DATE=2023-05-11
+MODULES_DATE=2024-05-01
 source /data/ssd1/software/${MODULES_DATE}/env.sh
 module load gcc
 module load binutils
diff --git a/dot_local/share/zinit/plugins/hpc/hpc.plugin.zsh.tmpl b/dot_local/share/zinit/plugins/hpc/hpc.plugin.zsh.tmpl
index 508d70c..6a02668 100644
--- a/dot_local/share/zinit/plugins/hpc/hpc.plugin.zsh.tmpl
+++ b/dot_local/share/zinit/plugins/hpc/hpc.plugin.zsh.tmpl
@@ -28,7 +28,7 @@ fi
 
 # Set the modules
 {{- if eq .nrel_cluster "ellis" }}
-MODULES_DATE=2023-05-11
+MODULES_DATE=2024-05-01
 source /data/ssd1/software/${MODULES_DATE}/env.sh
 export TMPDIR=/data/ssd1/home/${USER}/.tmp
 {{- else if eq .nrel_cluster "kestrel" }}
@@ -42,27 +42,52 @@ umask u=rwx,go=rx,o=rx
 function load_custom_modules {
 
     {
-        module purge
-        module load gcc
-        module load binutils
-        module load bzip2
-        module load cmake
-        module load ffmpeg/4.2.2
-        module load git
-        module load gnutls
-        module load htop
-        module load image-magick
-        module load libffi
-        module load libtool
-        module load py-setuptools-scm
-        module load sqlite
-        module load tmux
-        {{- if eq .nrel_cluster "ellis" }}
-        module load python/3.10.10
+        # Custom for OLCF HPC machines
+        {{- if .ornl_hpc }}
+          module load DefApps-spi/default
+          module load cmake
+          module load emacs
+          module load go
+          module load htop
+          module load imagemagick
+          module load tmux
+          module load cray-python
+        {{- else if (.nrel_hpc) }}
+          {{- if eq .nrel_cluster "ellis" }}
+          module purge
+          module load gcc
+          module load binutils
+          module load bzip2
+          module load cmake
+          module load ffmpeg
+          module load git
+          module load gnutls
+          module load htop
+          module load imagemagick
+          module load libffi
+          module load libtool
+          module load py-setuptools-scm
+          module load py-typing-extensions
+          module load py-packaging
+          module load sqlite
+          module load tmux
+          module load python/3.11.7
+          module load hunspell
+          module load npm
+          module load emacs/29.3
+          module load ccls
+          {{- else if eq .nrel_cluster "kestrel" }}
+          module load cmake
+          module load gnutls
+          module load htop
+          module load tmux
+          module load python/3.11.4
+          module load binutils
+          module load llvm
+          module load npm
+          module load emacs/29.2
+          {{- end }}
         {{- end }}
-
-        module load emacs/28.2
-        module load ccls
     } &> /dev/null
 }
 
@@ -82,24 +107,6 @@ function pvtunnel() {
 
 {{ end }}
 
-{{- if .ornl_hpc }}
-# Custom for OLCF HPC machines
-function load_custom_modules {
-    {
-        module load DefApps-spi/default
-        module load cmake
-        module load emacs
-        module load go
-        module load htop
-        module load imagemagick
-        module load tmux
-
-        module load cray-python
-
-    } &> /dev/null
-}
-{{ end }}
-
 {{- if or (.nrel_hpc) (.ornl_hpc) }}
 load_custom_modules
 {{ end }}