Merge branch 'develop' into patch-csv

modules/lang/data/config.el

@@ -1,60 +1,45 @@
 ;;; lang/data/config.el -*- lexical-binding: t; -*-
 
-(push '("/sxhkdrc" . conf-mode) auto-mode-alist)
+;; Built in plugins
+(dolist (spec '(("/sxhkdrc\\'" . conf-mode)
+                ("\\.\\(?:hex\\|nes\\)\\'" . hexl-mode)
+                ("\\.plist\\'" . nxml-mode)))
+  (map-put auto-mode-alist (car spec) (cdr spec)))
+
+(set! :company-backend 'nxml-mode '(company-nxml company-yasnippet))
 
 
-(def-package! dockerfile-mode
-  :mode "/Dockerfile$")
+;;
+;; Third-party plugins
+;;
 
+;; `csv-mode'
+(map! :after csv-mode
+      :map csv-mode-map
+      (:localleader
+        :desc "Align fields" :nvm "a" #'csv-align-fields
+        :desc "Unalign fields" :nvm "u" #'csv-unalign-fields
+        :desc "Sort fields" :nvm "s" #'csv-sort-fields
+        :desc "Sort fields (n)" :nvm "S" #'csv-sort-numeric-fields
+        :desc "Kill fields" :nvm "k" #'csv-kill-fields
+        :desc "Transpose fields" :nvm "t" #'csv-transpose))
 
 (def-package! graphql-mode
-  :mode "\\.g\\(?:raph\\)?ql$")
-
-(def-package! csv-mode
-  :mode "\\.csv$"
-  :config
-  (map! :map csv-mode-map
-        (:localleader
-          :desc "Align fields" :nvm "a" #'csv-align-fields
-          :desc "Unalign fields" :nvm "u" #'csv-unalign-fields
-          :desc "Sort fields" :nvm "s" #'csv-sort-fields
-          :desc "Sort fields (n)" :nvm "S" #'csv-sort-numeric-fields
-          :desc "Kill fields" :nvm "k" #'csv-kill-fields
-          :desc "Transpose fields" :nvm "t" #'csv-transpose)))
-
-
+  :mode "\\.gql\\'")
 
 (def-package! hexl ; For ROM hacking or debugging
   :mode ("\\.hex$" . hexl-mode)
   :mode ("\\.nes$" . hexl-mode))
 
-
 (def-package! json-mode
-  :mode "\\.js\\(?:on\\|[hl]int\\(rc\\)?\\)$"
+  :mode "\\.js\\(?:on\\|[hl]int\\(rc\\)?\\)\\'"
   :config
   (when (featurep! :feature syntax-checker)
     (add-hook 'json-mode-hook #'flycheck-mode))
   (set! :electric 'json-mode :chars '(?\n ?: ?{ ?})))
 
-
-(def-package! nxml-mode
-  :mode "\\.plist$"
-  :config
-  (set! :company-backend 'nxml-mode '(company-nxml company-yasnippet)))
-
-
-(def-package! toml-mode
-  :mode "\\.toml$")
-
-
 (def-package! vimrc-mode
-  :mode "/\\.?g?vimrc$"
-  :mode "\\.vimp?$"
-  :mode "\\.?vimperatorrc$")
-
-
-(def-package! yaml-mode
-  :mode "\\.ya?ml$")
+  :mode "\\.?vimperatorrc\\'")
 
 
 ;;