diff --git a/.bashrc b/.bashrc
index 0327751..3233fe6 100644
--- a/.bashrc
+++ b/.bashrc
@@ -11,12 +11,12 @@ source /etc/os-release
 # Aliases {{{
 # Load aliases dynamically
 [ -f "$HOME/.bash_aliases/all" ] && source "$HOME/.bash_aliases/all"
-[ -f "$HOME/.bash_aliases/$HOSTNAME" ] && source "$HOME/.bash_aliases/$HOSTNAME"
+[ -f "$HOME/.bash_aliases/hosts/$HOSTNAME" ] && source "$HOME/.bash_aliases/hosts/$HOSTNAME"
 [ -f "$HOME/.bash_aliases/private" ] && source "$HOME/.bash_aliases/private"
 # }}}
 
 # Dynamic configuration {{{
-[ -f "$HOME/.bashrc.d/$HOSTNAME" ] && source "$HOME/.bashrc.d/$HOSTNAME"
+[ -f "$HOME/.bashrc.d/hosts/$HOSTNAME" ] && source "$HOME/.bashrc.d/hosts/$HOSTNAME"
 [ -f "$HOME/.bashrc.d/private" ] && source "$HOME/.bashrc.d/private"
 # }}}
 
diff --git a/.bashrc.d/flex-arch b/.bashrc.d/flex-arch
deleted file mode 100644
index 9785a09..0000000
--- a/.bashrc.d/flex-arch
+++ /dev/null
@@ -1 +0,0 @@
-# Laptop configuration
diff --git a/.bashrc.d/desktop-arch b/.bashrc.d/hosts/desktop-arch
similarity index 100%
rename from .bashrc.d/desktop-arch
rename to .bashrc.d/hosts/desktop-arch
diff --git a/.bashrc.d/hosts/flex-arch b/.bashrc.d/hosts/flex-arch
new file mode 100644
index 0000000..e1d00ba
--- /dev/null
+++ b/.bashrc.d/hosts/flex-arch
@@ -0,0 +1,18 @@
+# Laptop configuration
+
+# >>> mamba initialize >>>
+# !! Contents within this block are managed by 'mamba init' !!
+export MAMBA_EXE="/usr/bin/micromamba";
+export MAMBA_ROOT_PREFIX="/home/h/.local/share/micromamba";
+__mamba_setup="$("$MAMBA_EXE" shell hook --shell bash --prefix "$MAMBA_ROOT_PREFIX" 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__mamba_setup"
+else
+    if [ -f "/home/h/.local/share/micromamba/etc/profile.d/micromamba.sh" ]; then
+        . "/home/h/.local/share/micromamba/etc/profile.d/micromamba.sh"
+    else
+        export  PATH="/home/h/.local/share/micromamba/bin:$PATH"  # extra space after export prevents interference from conda init
+    fi
+fi
+unset __mamba_setup
+# <<< mamba initialize <<<