Remove eagle

marchdf · Sep 5, 2024 · 7684e6b · 7684e6b
1 parent b37d062
commit 7684e6b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 46 deletions.
diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
@@ -8,7 +8,7 @@
 
 {{ $nrel_hpc := false -}}
 {{ $nrel_cluster := env "NREL_CLUSTER" | quote -}}
-{{- if or (eq (env "NREL_CLUSTER") "eagle") (eq (env "NREL_CLUSTER") "ellis") (eq (env "NREL_CLUSTER") "kestrel") -}}
+{{- if or (eq (env "NREL_CLUSTER") "ellis") (eq (env "NREL_CLUSTER") "kestrel") -}}
 {{ $nrel_hpc = true -}}
 {{- end -}}
 

diff --git a/bin/executable_pyenv_python_install.tmpl b/bin/executable_pyenv_python_install.tmpl
@@ -5,21 +5,7 @@ if [[ ! -x "$(command -v pyenv)" ]]; then
     exit 1
 fi
 
-{{- if eq .nrel_cluster "eagle" }}
-source /nopt/nrel/ecom/hpacf/env.sh
-module use ${HOME}/modules/linux-centos7-skylake_avx512
-module load gcc
-module load binutils
-module load git
-module load gnutls
-module load libtool
-module load bzip2
-module load libffi
-module load openssl
-module load sqlite
-export LDFLAGS="-L${OPENSSL_ROOT_DIR}/lib -L${LIBFFI_ROOT_DIR}/lib64 -L${BZIP2_ROOT_DIR}/lib -L${SQLITE_ROOT_DIR}/lib"
-export CPPFLAGS="-I${OPENSSL_ROOT_DIR}/include -I${LIBFFI_ROOT_DIR}/include -I${BZIP2_ROOT_DIR}/include -I${SQLITE_ROOT_DIR}/include"
-{{- else if eq .nrel_cluster "ellis" }}
+{{- if eq .nrel_cluster "ellis" }}
 MODULES_DATE=2023-05-11
 source /data/ssd1/software/${MODULES_DATE}/env.sh
 module load gcc

diff --git a/dot_config/iterm2/com.googlecode.iterm2.plist b/dot_config/iterm2/com.googlecode.iterm2.plist
@@ -3620,6 +3620,8 @@
 			<false/>
 			<key>Shortcut</key>
 			<string></string>
+			<key>Show Mark Indicators</key>
+			<false/>
 			<key>Silence Bell</key>
 			<true/>
 			<key>Space</key>

diff --git a/dot_emacs b/dot_emacs
@@ -151,7 +151,7 @@
   (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]tmp_build_dir\\'")
   (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]spack-build-.+\\'")
   (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\].spack-env\\'")
-  (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]exawind-manager/.cache\\'")
+  (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\].cache\\'")
   (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]exawind-manager/.tmp\\'")
   (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]exawind-manager/configs\\'")
   (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]exawind-manager/docs\\'")

diff --git a/dot_local/share/zinit/plugins/hpc/hpc.plugin.zsh.tmpl b/dot_local/share/zinit/plugins/hpc/hpc.plugin.zsh.tmpl
@@ -27,12 +27,7 @@ if [ -d "/scratch/${USER}" ]; then
 fi
 
 # Set the modules
-{{- if eq .nrel_cluster "eagle" }}
-source /nopt/nrel/utils/lmod/lmod/init/zsh
-source /nopt/nrel/ecom/hpacf/env.sh
-module use ${HOME}/modules/linux-centos7-skylake_avx512/gcc-9.3.0
-export TMPDIR=${SCRATCH}/.tmp
-{{- else if eq .nrel_cluster "ellis" }}
+{{- if eq .nrel_cluster "ellis" }}
 MODULES_DATE=2023-05-11
 source /data/ssd1/software/${MODULES_DATE}/env.sh
 export TMPDIR=/data/ssd1/home/${USER}/.tmp
@@ -62,12 +57,7 @@ function load_custom_modules {
         module load py-setuptools-scm
         module load sqlite
         module load tmux
-        {{- if eq .nrel_cluster "eagle" }}
-        module load python/3.7.7
-        module load mpt
-        module load openssl
-        module load texlive
-        {{- else if eq .nrel_cluster "ellis" }}
+        {{- if eq .nrel_cluster "ellis" }}
         module load python/3.10.10
         {{- end }}
 

diff --git a/dot_local/share/zinit/plugins/personal/personal.plugin.zsh.tmpl b/dot_local/share/zinit/plugins/personal/personal.plugin.zsh.tmpl
@@ -155,7 +155,7 @@ tab-reset() {
 color-ssh() {
     if [[ -n "$ITERM_SESSION_ID" ]]; then
         trap "tab-reset" INT EXIT
-        if [[ "$*" =~ "el1|el2|el3|ed1|dav1|dav2|dav3" ]]; then
+        if [[ "$*" =~ "dav1|dav2|dav3" ]]; then
             tab-color 24 90 169
         elif [[ "$*" =~ "kl1|kl2" ]]; then
             tab-color 244 125 35

diff --git a/dot_ssh/config b/dot_ssh/config
@@ -14,22 +14,6 @@ host hpacf
     User mhenryde
     hostname hpacf01.hpc.nrel.gov
 
-host el1
-    User mhenryde
-    hostname el1.hpc.nrel.gov
-
-host el2
-    User mhenryde
-    hostname el2.hpc.nrel.gov
-
-host el3
-    User mhenryde
-    hostname el3.hpc.nrel.gov
-
-host ed1
-    User mhenryde
-    hostname ed1.hpc.nrel.gov
-
 host dav1
     User mhenryde
     hostname dav1.hpc.nrel.gov
@@ -54,6 +38,10 @@ host kl2
     User mhenryde
     hostname kl2.hpc.nrel.gov
 
+host kl5
+    User mhenryde
+    hostname kl5.hpc.nrel.gov
+
 host cori
     User marchdf
     hostname cori.nersc.gov
@@ -104,11 +92,23 @@ host frontier
     User marchdf
     hostname frontier.olcf.ornl.gov
     ControlMaster no
+    Compression yes
+    ForwardX11 yes
+    ForwardX11Trusted yes
+    ControlMaster auto
+    ControlPersist 12h
+    ControlPath ~/.ssh/%r@%h:%p
 
 host f10
     User marchdf
     hostname login10.frontier.olcf.ornl.gov
     ControlMaster no
+    Compression yes
+    ForwardX11 yes
+    ForwardX11Trusted yes
+    ControlMaster auto
+    ControlPersist 12h
+    ControlPath ~/.ssh/%r@%h:%p
 
 host andes
     User marchdf