From 5041d8d0c42547e5e25eafee8d95db503b68f30e Mon Sep 17 00:00:00 2001
From: Joe Ipson <joe@ipson.me>
Date: Wed, 31 Jan 2024 20:47:25 -0700
Subject: [PATCH] Some distrobox changes

---
 config/common_modules/rpm-ostree.yml | 2 ++
 config/files/usr/bin/distrobox-user  | 2 ++
 config/files/usr/etc/skel/.zshrc     | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/config/common_modules/rpm-ostree.yml b/config/common_modules/rpm-ostree.yml
index b5b60a6..f0d36b4 100644
--- a/config/common_modules/rpm-ostree.yml
+++ b/config/common_modules/rpm-ostree.yml
@@ -15,6 +15,8 @@ install:
   - system76-power
   - android-tools
   - zsh
+  - mosh
+  - micro
   - gnome-boxes
   - code
   - p7zip
diff --git a/config/files/usr/bin/distrobox-user b/config/files/usr/bin/distrobox-user
index 2de3e82..492a386 100755
--- a/config/files/usr/bin/distrobox-user
+++ b/config/files/usr/bin/distrobox-user
@@ -5,6 +5,8 @@ set -oue pipefail
 # Run setup
 echo 'Running initial setup...'
 
+mkdir -p "$XDG_CONFIG_HOME/config.d"
+
 # Install oh-my-zsh
 ZSH="$XDG_CONFIG_HOME/oh-my-zsh" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 
diff --git a/config/files/usr/etc/skel/.zshrc b/config/files/usr/etc/skel/.zshrc
index b04bd31..3b4f127 100644
--- a/config/files/usr/etc/skel/.zshrc
+++ b/config/files/usr/etc/skel/.zshrc
@@ -16,9 +16,18 @@ if [ -n "$CONTAINER_ID" ]; then
 
   source "$XDG_CONFIG_HOME/.zshrc"
   unset SETUP_DONE
+
+  for conf in "$XDG_CONFIG_HOME/config.d/"*.zsh; do
+    source "${conf}"
+  done
 else
   # localhost
   source "$HOME/.config/contexts/localhost/.zshrc"
+
+  for conf in "$HOME/.config/contexts/localhost/config.d/"*.zsh; do
+    source "${conf}"
+  done
+  unset conf
 fi
 
 # Load seperated config files