From 09b7c4576b868bd3dc5406e039807019e8699441 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 9 Mar 2018 15:11:56 -0500 Subject: emacs: fix editorconfig-mode --- .config/emacs/init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 4d6543b..efb2d71 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -73,7 +73,8 @@ (smart-tabs-mode 1) (apply 'smart-tabs-insinuate (mapcar 'car smart-tabs-insinuate-alist)))) -(use-package editorconfig) +(use-package editorconfig + :config (editorconfig-mode 1)) ;; Major modes (use-package bison-mode :mode (("\\.l\\'" . bison-mode) -- cgit v1.1-4-g5e80 From d208830d6cebfd82079c680532e294cd23ab4de4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 9 Mar 2018 15:12:22 -0500 Subject: emacs: set C-tab to do code-folding in js-mode --- .config/emacs/init.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index efb2d71..4b91d8f 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -320,6 +320,12 @@ sh-script.el is broken." (sh-electric-here-document-mode 0) )) +(add-hook 'js-mode-hook + (lambda () + (hs-minor-mode t) + (local-set-key [C-tab] 'hs-toggle-hiding) + )) + (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode)) (add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode)) (add-to-list 'auto-mode-alist '("\\.mak\\'" . makefile-gmake-mode)) -- cgit v1.1-4-g5e80 From cc7c66d2fb69df3cb176ed68eb5c776305994f51 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 9 Mar 2018 15:12:58 -0500 Subject: emacs: tidy major modes --- .config/emacs/init.el | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 4b91d8f..da8763f 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -75,11 +75,24 @@ (mapcar 'car smart-tabs-insinuate-alist)))) (use-package editorconfig :config (editorconfig-mode 1)) -;; Major modes +;; Major modes (non-HTML-related) (use-package bison-mode :mode (("\\.l\\'" . bison-mode) ("\\.y\\'" . bison-mode) ("\\.jison\\'" . jison-mode))) +(use-package cmake-mode :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'")) +(use-package glsl-mode :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'")) +(use-package go-mode :mode "\\.go\\'") +(use-package graphviz-dot-mode + :mode ("\\.dot\\'" "\\.gv\\'") + :config (add-hook 'graphviz-dot-mode-hook + '(lambda () + (set (make-local-variable 'graphviz-dot-auto-indent-on-semi) nil) + ))) +(use-package markdown-mode :mode ("\\.markdown\\'" "\\.md\\'" "\\.ronn\\'")) +(use-package nginx-mode :mode ("nginx\\.conf\\'" "/nginx/.+\\.conf\\'")) +(use-package yaml-mode :mode "\\.\\(e?ya?\\|ra\\)ml\\'") +;; Major modes (HTML-related) (use-package coffee-mode :mode ("\\.coffee\\'" "\\.iced\\'" @@ -91,26 +104,14 @@ (set (make-local-variable 'tab-width) 2) (set (make-local-variable 'indent-tabs-mode) nil) ))) -(use-package cmake-mode :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'")) -(use-package glsl-mode :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'")) -(use-package go-mode :mode "\\.go\\'") -(use-package graphviz-dot-mode - :mode ("\\.dot\\'" "\\.gv\\'") - :config (add-hook 'graphviz-dot-mode-hook - '(lambda () - (set (make-local-variable 'graphviz-dot-auto-indent-on-semi) nil) - ))) (use-package haml-mode :mode "\\.haml\\'") (use-package less-css-mode :mode "\\.less\\'") -(use-package markdown-mode :mode ("\\.markdown\\'" "\\.md\\'" "\\.ronn\\'")) -(use-package nginx-mode :mode ("nginx\\.conf\\'" "/nginx/.+\\.conf\\'")) (use-package php-mode :mode ("\\.php[s345t]?\\'" "/\\.php_cs\\(\\.dist\\)?\\'" "\\.phtml\\'" "/Amkfile\\'" "\\.amk\\'") :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 yaml-mode :mode "\\.\\(e?ya?\\|ra\\)ml\\'") ;;(use-package nxhtml) ; nxhtml is invasive, only enable if actively using -- cgit v1.1-4-g5e80 From ea2d3c215b3b781a5a07a6e8ea51de51c580faf1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 9 Mar 2018 15:13:40 -0500 Subject: emacs: place melpa *after* the main GNU servers --- .config/emacs/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index da8763f..7ce9d61 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -52,7 +52,7 @@ ;; package.el (require 'package) -(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) +(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t) (setq package-enable-at-startup nil) (package-initialize) ;; use-package.el -- cgit v1.1-4-g5e80