From 8cab2f19fd272c79328ff2e2357af33cbfb3e1f9 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 14 May 2018 20:47:53 +0200
Subject: [PATCH] Remove redundant config & auto-mode-alist entries

Much of this config is done in package autoloads, and now that
auto-mode-alist is cached in doom-package-alist (after reading autoload
files), we can save some space by removing redundant config.
---
 modules/feature/version-control/+git.el | 14 +++++---------
 modules/lang/elixir/config.el           |  4 ++--
 modules/lang/javascript/config.el       | 10 +++++-----
 modules/lang/web/+css.el                | 18 +++---------------
 modules/lang/web/+html.el               | 10 ++--------
 5 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el
index c042437d1..cbb110f5f 100644
--- a/modules/feature/version-control/+git.el
+++ b/modules/feature/version-control/+git.el
@@ -1,18 +1,14 @@
 ;;; feature/version-control/+git.el -*- lexical-binding: t; -*-
 
+;; These don't need `def-package!' blocks because they've already been set up by
+;; `doom-initialize'.
+(autoload 'gitconfig-mode "gitconfig-mode" nil t)
+(autoload 'gitignore-mode "gitignore-mode" nil t)
+
 (when (featurep! :feature evil)
   (add-hook 'git-commit-mode-hook #'evil-insert-state))
 
 
-(def-package! gitconfig-mode
-  :mode "/\\.?git/?config$"
-  :mode "/\\.gitmodules$")
-
-
-(def-package! gitignore-mode
-  :mode "/\\.gitignore$")
-
-
 (def-package! git-gutter-fringe
   :defer t
   :init
diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el
index b12b3426c..a7f8044dc 100644
--- a/modules/lang/elixir/config.el
+++ b/modules/lang/elixir/config.el
@@ -1,8 +1,8 @@
 ;;; lang/elixir/config.el -*- lexical-binding: t; -*-
 
 (def-package! elixir-mode
-  :mode "\\.exs?$"
-  :mode "\\.elixir2$"
+  :mode "\\.exs?\\'"
+  :mode "\\.elixir2\\'"
   :init
   ;; sp's default elixir rules are obnoxious, so disable them
   (provide 'smartparens-elixir)
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 137ed706b..b84c011da 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -5,7 +5,7 @@
 ;;
 
 (def-package! js2-mode
-  :mode "\\.js$"
+  :mode "\\.js\\'"
   :interpreter "node"
   :config
   (setq js2-skip-preprocessor-directives t
@@ -35,15 +35,15 @@
 
 
 (def-package! typescript-mode
-  :mode "\\.ts$"
+  :commands typescript-mode
   :config
   (add-hook! 'typescript-mode-hook #'(flycheck-mode rainbow-delimiters-mode))
-  (set! :electric 'typescript-mode :chars '(?\} ?\)) :words '("||" "&&")))
+  (set! :electric 'typescript-mode
+    :chars '(?\} ?\)) :words '("||" "&&")))
 
 
 (def-package! rjsx-mode
   :commands rjsx-mode
-  :mode "\\.jsx$"
   :mode "components/.+\\.js$"
   :init
   (defun +javascript-jsx-file-p ()
@@ -73,7 +73,7 @@
 
 
 (def-package! coffee-mode
-  :mode "\\.coffee$"
+  :defer t  ; file extensions registered by autoloads file
   :init (setq coffee-indent-like-python-mode t))
 
 
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index dbad9c360..cadfd2a40 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -2,7 +2,7 @@
 
 ;; css-mode hooks apply to scss and less-css modes
 (add-hook 'css-mode-hook #'rainbow-delimiters-mode)
-(add-hook! (css-mode sass-mode)
+(add-hook! (css-mode sass-mode stylus-mode)
   #'(yas-minor-mode-on flycheck-mode highlight-numbers-mode))
 
 ;; An improved newline+continue comment function
@@ -35,10 +35,7 @@
   :hook (css-mode sass-mode))
 
 
-(def-package! css-mode
-  :mode "\\.css$"
-  :mode ("\\.scss$" . scss-mode)
-  :config
+(after! css-mode ; contains both css-mode & scss-mode
   (set! :docset 'css-mode "CSS")
   (set! :docset 'scss-mode "Sass")
   (set! :company-backend '(css-mode scss-mode) 'company-css)
@@ -46,18 +43,9 @@
 
 
 (def-package! sass-mode
-  :mode "\\.sass$"
+  :commands sass-mode
   :config
   (set! :docset 'sass-mode "Sass")
   (set! :company-backend 'sass-mode 'company-css)
   (map! :map scss-mode-map :localleader :n "b" #'+css/sass-build))
 
-
-(def-package! less-css-mode
-  :mode "\\.less$")
-
-
-(def-package! stylus-mode
-  :mode "\\.styl$"
-  :init (add-hook! stylus-mode #'(yas-minor-mode-on flycheck-mode)))
-
diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el
index 9cf432438..8a724fd0e 100644
--- a/modules/lang/web/+html.el
+++ b/modules/lang/web/+html.el
@@ -96,11 +96,5 @@
   :after web-mode)
 
 
-(def-package! haml-mode :mode "\\.haml$")
-
-
-(def-package! pug-mode
-  :mode "\\.jade$"
-  :mode "\\.pug$"
-  :config
-  (set! :company-backend 'pug-mode '(company-yasnippet)))
+;; `pug-mode'
+(set! :company-backend 'pug-mode '(company-yasnippet))