 
   (add-hook 'vimrc-mode-hook #'radian--fix-vimrc-indentation))
 
-;; Edit .htaccess and friends.
-(use-package apache-mode
+;; Provides syntax highlighting, indentation, and editing commands for
+;; YAML files.
+(use-package yaml-mode
   :defer-install t
-  :mode (("\\.htaccess\\'"   . apache-mode)
-         ("httpd\\.conf\\'"  . apache-mode)
-         ("srm\\.conf\\'"    . apache-mode)
-         ("access\\.conf\\'" . apache-mode)
-         ("sites-\\(available\\|enabled\\)/" . apache-mode)))
+  :mode "\\.\\(e?ya?\\|ra\\)ml\\'"
+  :config
+
+  ;; Don't automatically wrap text when editing YAML files.
+
+  (defun radian--disable-auto-fill-mode ()
+    (auto-fill-mode -1))
+
+  (add-hook 'yaml-mode-hook #'radian--disable-auto-fill-mode))
 
 (provide 'radian-config)
 


(require 'radian-package)

;; Provides syntax highlighting, indentation, and editing commands for
;; YAML files.
(use-package yaml-mode
  :defer-install t
  :mode "\\.\\(e?ya?\\|ra\\)ml\\'"
  :config

  ;; Don't automatically wrap text when editing YAML files.

  (defun radian--disable-auto-fill-mode ()
    (auto-fill-mode -1))

  (add-hook 'yaml-mode-hook #'radian--disable-auto-fill-mode))

;; Editing for TOML files.
(use-package toml-mode

    (setq mode-name "TOML"))

  (add-hook 'toml-mode-hook #'radian--rename-toml-mode))

;; Provides syntax highlighting for VimScript files.
(use-package vimrc-mode
