diff --git a/modules/config/default/+emacs.el b/modules/config/default/+emacs.el
deleted file mode 100644
index a68711bb2..000000000
--- a/modules/config/default/+emacs.el
+++ /dev/null
@@ -1,26 +0,0 @@
-;;; config/default/+emacs.el -*- lexical-binding: t; -*-
-
-(require 'projectile) ; we need its keybinds immediately
-
-
-;;
-;;; Reasonable defaults
-
-(setq shift-select-mode t)
-(delete-selection-mode +1)
-
-(use-package! expand-region
-  :commands (er/contract-region er/mark-symbol er/mark-word)
-  :config
-  (defadvice! doom--quit-expand-region-a (&rest _)
-    "Properly abort an expand-region region."
-    :before '(evil-escape doom/escape)
-    (when (memq last-command '(er/expand-region er/contract-region))
-      (er/contract-region 0))))
-
-
-;;
-;;; Keybinds
-
-(when (modulep! +bindings)
-  (load! "+emacs-bindings"))
diff --git a/modules/config/default/+evil.el b/modules/config/default/+evil.el
deleted file mode 100644
index a5ddc3099..000000000
--- a/modules/config/default/+evil.el
+++ /dev/null
@@ -1,21 +0,0 @@
-;;; config/default/+evil.el -*- lexical-binding: t; -*-
-
-(defun +default-disable-delete-selection-mode-h ()
-  (delete-selection-mode -1))
-(add-hook 'evil-insert-state-entry-hook #'delete-selection-mode)
-(add-hook 'evil-insert-state-exit-hook  #'+default-disable-delete-selection-mode-h)
-
-
-;;
-;;; Keybindings
-
-;; This section is dedicated to "fixing" certain keys so that they behave
-;; sensibly (and consistently with similar contexts).
-
-;; Make SPC u SPC u [...] possible (#747)
-(map! :map universal-argument-map
-      :prefix doom-leader-key     "u" #'universal-argument-more
-      :prefix doom-leader-alt-key "u" #'universal-argument-more)
-
-(when (modulep! +bindings)
-  (load! "+evil-bindings"))
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 850ef4f45..a3368b0cd 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -565,6 +565,34 @@ Continues comments if executed from a commented line."
 ;;
 ;;; Bootstrap configs
 
-(if (featurep 'evil)
-    (load! "+evil")
-  (load! "+emacs"))
+(cond
+ ((modulep! :editor evil)
+  (defun +default-disable-delete-selection-mode-h ()
+    (delete-selection-mode -1))
+  (add-hook 'evil-insert-state-entry-hook #'delete-selection-mode)
+  (add-hook 'evil-insert-state-exit-hook  #'+default-disable-delete-selection-mode-h)
+
+  ;; Make SPC u SPC u [...] possible (#747)
+  (map! :map universal-argument-map
+        :prefix doom-leader-key     "u" #'universal-argument-more
+        :prefix doom-leader-alt-key "u" #'universal-argument-more)
+
+  (when (modulep! +bindings)
+    (load! "+evil-bindings")))
+
+ (t
+  (add-hook 'doom-first-buffer-hook #'delete-selection-mode)
+  (setq shift-select-mode t)
+
+  (use-package! expand-region
+    :commands (er/contract-region er/mark-symbol er/mark-word)
+    :config
+    (defadvice! doom--quit-expand-region-a (&rest _)
+      "Properly abort an expand-region region."
+      :before '(evil-escape doom/escape)
+      (when (memq last-command '(er/expand-region er/contract-region))
+        (er/contract-region 0))))
+
+  (when (modulep! +bindings)
+    (require 'projectile nil t) ; we need its keybinds immediately
+    (load! "+emacs-bindings"))))