From 7bc7921a17d425e1dcb0f6c580ec8678e2a07d32 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Wed, 17 Jul 2024 09:39:57 +0300
Subject: [PATCH] chore: rename scripts/shared

---
 base/bashrc                  | 2 +-
 base/zshrc                   | 5 ++---
 config/{shared => shared.sh} | 1 -
 scripts/shared.sh            | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename config/{shared => shared.sh} (99%)
 mode change 100644 => 100755

diff --git a/base/bashrc b/base/bashrc
index 4941727..550a600 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -1,7 +1,7 @@
 # this is my bashrc config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-source "$HOME/.dotfiles/config/shared"
+source "$HOME/.dotfiles/config/shared.sh"
 
 x-load-configs
 
diff --git a/base/zshrc b/base/zshrc
index c269079..f5d17b1 100755
--- a/base/zshrc
+++ b/base/zshrc
@@ -1,12 +1,11 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-source "$HOME/.dotfiles/config/shared"
+eval "$HOME/.dotfiles/config/shared.sh"
+x-load-configs
 
 export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 
-x-load-configs
-
 x-have oh-my-posh && {
   eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
 }
diff --git a/config/shared b/config/shared.sh
old mode 100644
new mode 100755
similarity index 99%
rename from config/shared
rename to config/shared.sh
index 702d749..2faf6eb
--- a/config/shared
+++ b/config/shared.sh
@@ -21,4 +21,3 @@ export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOM
 source "$DOTFILES/config/exports"
 source "$DOTFILES/config/functions"
 source "$DOTFILES/config/alias"
-
diff --git a/scripts/shared.sh b/scripts/shared.sh
index 9908ebd..5b48c8a 100755
--- a/scripts/shared.sh
+++ b/scripts/shared.sh
@@ -12,7 +12,7 @@
     || [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null)
 ) && sourced=1 || sourced=0
 
-source "$HOME/.dotfiles/config/shared"
+source "$HOME/.dotfiles/config/shared.sh"
 
 DOTFILES_CURRENT_SHELL=$(ps -p $$ -oargs=)
 export DOTFILES_CURRENT_SHELL