diff --git a/.bashrc.d/60_server.sh b/.bashrc.d/60_server.sh
new file mode 100644
index 0000000..106b30f
--- /dev/null
+++ b/.bashrc.d/60_server.sh
@@ -0,0 +1,18 @@
+#
+# ~/.bashrc.d/60_server.sh -- Custom .bashrc additions for server environments
+#
+
+# Set this alias only on hosts where restic is installed
+if which restic &>/dev/null; then
+    alias restic-source-env="source /etc/restic/restic.env"
+fi
+
+# Assume colors are set in global .bashrc:
+# TRED, TGREEN, TBLUE, TGREENB, TCYANB, TWHITEB (bold), TRESET
+
+# Set prompt: highlight hostname in red to signalize "you're on a server, be careful"
+if [[ ${EUID} == 0 ]] ; then
+	PS1="${TRED}\u@\h ${TBLUE}\w ${TWHITEB}\$ ${TRESET}"
+else
+	PS1="${TGREEN}\u@${TRED}\h ${TBLUE}\w ${TWHITEB}\$ ${TRESET}"
+fi
diff --git a/_local/_server/.bashrc.local b/_local/_server/.bashrc.local
deleted file mode 100644
index 350cee1..0000000
--- a/_local/_server/.bashrc.local
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# ~/.bashrc.local -- SERVER version
-#
-
-alias restic-source-env="source /etc/restic/restic.env"
-
-# Assume colors are set in global .bashrc:
-# - TRED
-# - TGREEN
-# - TBLUE
-# - TGREENB
-# - TCYANB
-# - TWHITEB (bold)
-# - TRESET
-
-# Set prompt: highlight hostname in red to signalize "you're on a server, be careful"
-
-if [[ ${EUID} == 0 ]] ; then
-	PS1="${TRED}\u@\h ${TBLUE}\w ${TWHITEB}\$ ${TRESET}"
-else
-	PS1="${TGREEN}\u@${TRED}\h ${TBLUE}\w ${TWHITEB}\$ ${TRESET}"
-fi
-
diff --git a/_local/toriel/.bashrc.local b/_local/toriel/.bashrc.local
deleted file mode 100644
index 22802e9..0000000
--- a/_local/toriel/.bashrc.local
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# ~/.bashrc.local -- toriel version
-#
-
-#alias restic-source-env="source /etc/restic/restic.env"
-
-# Assume colors are set in global .bashrc:
-# - TRED
-# - TGREEN
-# - TBLUE
-# - TGREENB
-# - TCYANB
-# - TWHITEB (bold)
-# - TRESET
-
-# Set prompt: highlight hostname in red to signalize "you're on a server, be careful"
-
-if [[ ${EUID} == 0 ]] ; then
-	PS1="${TRED}\u@\h ${TBLUE}\w ${TWHITEB}\$ ${TRESET}"
-else
-	PS1="${TGREEN}\u@${TRED}\h ${TBLUE}\w ${TWHITEB}\$ ${TRESET}"
-fi
-