emacs: misc

2 files changed, 19 insertions, 28 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 77c2819..ef8cdbe 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -6,29 +6,13 @@
  '(erc-nick "lukeshu")
  '(global-whitespace-mode nil)
  '(graphviz-dot-auto-indent-on-semi nil)
- '(org-latex-default-packages-alist
+ '(package-selected-packages
    (quote
-    (("" "fontspec" t)
-     ("" "fixltx2e" nil)
-     ("" "graphicx" t)
-     ("" "longtable" nil)
-     ("" "float" nil)
-     ("" "wrapfig" nil)
-     ("" "rotating" nil)
-     ("normalem" "ulem" t)
-     ("" "amsmath" t)
-     ("" "textcomp" t)
-     ("" "marvosym" t)
-     ("" "wasysym" t)
-     ("" "amssymb" t)
-     ("" "hyperref" nil)
-     "\\tolerance=1000")))
- '(org-latex-pdf-process
-   (quote
-    ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f")))
+    (terraform-mode protobuf-mode web-mode outline-magic dockerfile-mode plantuml-mode vue-mode typescript-mode scss-mode php-mode haml-mode coffee-mode yaml-mode nginx-mode meson-mode markdown-mode graphviz-dot-mode go-mode glsl-mode cmake-mode bison-mode bats-mode editorconfig smart-tabs-mode page-break-lines abyss-theme)))
  '(safe-local-variable-values
    (quote
-    ((sgml-basic-offset . 8)
+    ((eval outline-show-all)
+     (sgml-basic-offset . 8)
      (nxml-child-indent . 2)
      (sentence-end-double-space nil)
      (Fill-Column . 64)
@@ -51,7 +35,8 @@
      (Nginx-indent-level . 4)
      (Nginx-indent-level . 8)
      (c-set-style . "K&R"))))
- '(use-package-verbose (quote debug)))
+ '(use-package-verbose (quote debug))
+ '(yaml-block-literal-electric-alist nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 5cdbf2f..9c46633 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -71,11 +71,11 @@
   :init (advice-add 'page-break-lines-mode-maybe
                     :override #'page-break-lines-mode)
   :config (global-page-break-lines-mode 1))
-(use-package smart-tabs-mode ;; Indent with tabs, align with spaces
-  :config (progn
-            (smart-tabs-mode 1)
-            (apply 'smart-tabs-insinuate
-                   (mapcar 'car smart-tabs-insinuate-alist))))
+;; (use-package smart-tabs-mode ;; Indent with tabs, align with spaces
+;;   :config (progn
+;;             (smart-tabs-mode 1)
+;;             (apply 'smart-tabs-insinuate
+;;                    (mapcar 'car smart-tabs-insinuate-alist))))
 (use-package editorconfig
   :config (editorconfig-mode 1))
 (use-package outline-magic
@@ -92,8 +92,12 @@
          ("\\.y\\'" . bison-mode)
          ("\\.jison\\'" . jison-mode)))
 (use-package cmake-mode        :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'"))
+(use-package dockerfile-mode
+  :mode "Dockerfile\\(?:\\..*\\)?\\'"
+  :commands (dockerfile-build-buffer
+             dockerfile-build-no-cache-buffer))
 (use-package glsl-mode         :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'"))
-(use-package go-mode           :mode "\\.go\\'")
+(use-package go-mode           :mode ("\\.go\\'" "go\\.mod"))
 (use-package graphviz-dot-mode
   :mode ("\\.dot\\'" "\\.gv\\'")
   :config (add-hook 'graphviz-dot-mode-hook
@@ -103,6 +107,8 @@
 (use-package markdown-mode     :mode ("\\.markdown\\'" "\\.md\\'" "\\.ronn\\'"))
 (use-package meson-mode        :mode "/meson\\(\\.build\\|_options\\.txt\\)\\'")
 (use-package nginx-mode        :mode ("nginx\\.conf\\'" "/nginx/.+\\.conf\\'"))
+(use-package protobuf-mode     :mode "\\.proto\\'")
+(use-package terraform-mode    :mode "\\.tf\\(vars\\)?\\'")
 (use-package yaml-mode
   :mode "\\.\\(e?ya?\\|ra\\)ml\\'"
   :config (add-hook 'yaml-mode-hook
@@ -129,7 +135,7 @@
   :interpreter "php\\(?:-?[3457]\\(?:\\.[0-9]+\\)*\\)?")
 (use-package scss-mode         :mode "\\.scss\\'")
 (use-package typescript-mode   :mode "\\.ts\\'")
-(use-package vue-mode          :mode "\\.vue\\'")
+(use-package web-mode          :mode "\\.html\\'")
 
 ;;(use-package nxhtml) ; nxhtml is invasive, only enable if actively using