From 51afab44ef616207e09ce4e5f68959a6f9c41f3f Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Thu, 31 Aug 2023 09:56:26 +0300
Subject: [PATCH] fix(shell): add missing hostname to config loaders

---
 base/bashrc            |  5 +++--
 hosts/lakka/base/zshrc | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/base/bashrc b/base/bashrc
index d094256..dfa220d 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -7,12 +7,13 @@ export DOTFILES="$HOME/.dotfiles"
 # Run x-load-configs in your terminal to reload the files.
 function x-load-configs()
 {
+    HOST="$(hostname -s)"
     # Load the shell dotfiles, and then some:
     for file in $DOTFILES/config/{exports,alias,functions}; do
         [ -r "$file" ] && source "$file"
         [ -r "$file-secret" ] && source "$file-secret"
-        [ -r "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-        [ -r "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+        [ -r "$file-$HOST" ] && source "$file-$HOST"
+        [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
     done
 }
 x-load-configs
diff --git a/hosts/lakka/base/zshrc b/hosts/lakka/base/zshrc
index e6c9959..99d994e 100644
--- a/hosts/lakka/base/zshrc
+++ b/hosts/lakka/base/zshrc
@@ -9,13 +9,14 @@ export DOTFILES="$HOME/.dotfiles"
 # Run x-load-configs in your terminal to reload the files.
 function x-load-configs()
 {
-    # Load the shell dotfiles, and then some:
-    for file in $DOTFILES/config/{exports,alias,functions}; do
-        [ -r "$file" ] && [ -f "$file" ] && source "$file"
-        [ -r "$file-secret" ] && [ -f "$file-secret" ] && source "$file-secret"
-        [ -r "$file-$HOSTNAME" ] && [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-        [ -r "$file-$HOSTNAME-secret" ] && [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
-    done
+  HOST="$(hostname -s)"
+  # Load the shell dotfiles, and then some:
+  for file in $DOTFILES/config/{exports,alias,functions}; do
+      [ -r "$file" ] && source "$file"
+      [ -r "$file-secret" ] && source "$file-secret"
+      [ -r "$file-$HOST" ] && source "$file-$HOST"
+      [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
+  done
 }
 x-load-configs