diff --git a/.bashrc b/.bashrc
index e954ea3..4746128 100644
--- a/.bashrc
+++ b/.bashrc
@@ -2,11 +2,10 @@
 
 # Source global definitions
 if [ -f /etc/bashrc ]; then
-	. /etc/bashrc
+  . /etc/bashrc
 fi
 
-alias dotfiles="git -c include.path=$HOME/.dotfiles/dotgit_config --git-dir=$HOME/.dotgit/ --work-tree=$HOME"
-
-# I should later write this as a function that checks for the existence of a
-# venv subdirectory
-alias activate="source venv/bin/activate"
+# Source .bashrc.d
+for file in ~/.bashrc.d/*.bashrc; do
+  . "$file"
+done
diff --git a/.bashrc.d/dotfiles.bashrc b/.bashrc.d/dotfiles.bashrc
new file mode 100644
index 0000000..8b7ebfc
--- /dev/null
+++ b/.bashrc.d/dotfiles.bashrc
@@ -0,0 +1,2 @@
+alias dotfiles="git -c include.path=$HOME/.dotfiles/dotgit_config --git-dir=$HOME/.dotgit/ --work-tree=$HOME"
+complete -o bashdefault -o default -o nospace -F __git_wrap__git_main dotfiles