diff --git a/.bashrc b/.bashrc
index 4c4bbd5..15a9f71 100644
--- a/.bashrc
+++ b/.bashrc
@@ -9,6 +9,11 @@ source /etc/os-release
 [ -f "$HOME/.bash_aliases/$HOSTNAME" ] && source "$HOME/.bash_aliases/$HOSTNAME"
 [ -f "$HOME/.bash_aliases/private" ] && source "$HOME/.bash_aliases/private"
 # }}}
+
+# Host-specific {{{
+[ -f "$HOME/.bashrc.d/$HOSTNAME" ] && source "$HOME/.bashrc.d/$HOSTNAME"
+# }}}
+
 # }}}
 
 # Prompt {{{
diff --git a/.bashrc.d/desktop-arch b/.bashrc.d/desktop-arch
new file mode 100644
index 0000000..c0b612f
--- /dev/null
+++ b/.bashrc.d/desktop-arch
@@ -0,0 +1 @@
+# Desktop configuration
diff --git a/.bashrc.d/flex-arch b/.bashrc.d/flex-arch
new file mode 100644
index 0000000..9785a09
--- /dev/null
+++ b/.bashrc.d/flex-arch
@@ -0,0 +1 @@
+# Laptop configuration