Fix auto-mode-alist manual additions

1 files changed, 8 insertions, 13 deletions

diff --git a/init.el b/init.el
index ebfbd70..71a4d6d 100644
--- a/init.el
+++ b/init.el
@@ -237,15 +237,6 @@ Should be one of `:white-split', `:modified' or `:default'")
 
   (set-frame-font "Iosevka YMHG Semibold-14" nil t)
 
-  (setq auto-mode-alist
-        (append
-         (list ;;'("\\.\\(vcf\\|gpg\\)\\'" . sensitive-minor-mode)
-          '("\\.v\\'" . coq-mode)
-          '("\\.mkiv\\'" . context-mode)
-          '("\\.mkii\\'" . context-mode)
-          '("\\.mkxl\\'" . context-mode))
-         auto-mode-alist))
-
   (add-to-list 'mode-line-misc-info
                '(t ("[t:" (:eval (alist-get 'name (tab-bar--current-tab))) "] ")))
 
@@ -925,7 +916,8 @@ https://yannherklotz.com"))
 
 (use-package proof-general
   :ensure t
-  :config
+  :mode ("\\.v\\'" . coq-mode)
+  :init
   (setq proof-splash-enable nil)
   (setq proof-auto-action-when-deactivating-scripting 'retract)
   (setq proof-delete-empty-windows nil)
@@ -939,7 +931,7 @@ https://yannherklotz.com"))
   (setq coq-compile-quick 'no-quick)
   (setq coq-max-background-compilation-jobs 4)
   (setq coq-indent-modulestart 0)
-
+  :config
   (defun ymh--reset-coq-indentation ()
     "Reset slow indentation."
     (setq-local indent-line-function #'indent-relative))
@@ -968,6 +960,9 @@ https://yannherklotz.com"))
 
 (use-package tex
   :ensure auctex
+  :mode (("\\.mkiv\\'" . context-mode)
+         ("\\.mkii\\'" . context-mode)
+         ("\\.mkxl\\'" . context-mode))
   :init
   (setq TeX-auto-save t)
   (setq TeX-parse-self t)
@@ -1000,10 +995,10 @@ https://yannherklotz.com"))
 
 (use-package verilog-mode
   :defer t
+  :mode "\\.sv\\'"
   :no-require t
   :config
-  (setq auto-mode-alist (delete '("\\.v\\'" . verilog-mode) auto-mode-alist))
-  (add-to-list 'auto-mode-alist '("\\.sv\\'" . verilog-mode)))
+  (setq auto-mode-alist (delete '("\\.v\\'" . verilog-mode) auto-mode-alist)))
 
 (use-package hungry-delete
   :ensure t