From d178d78b2b5c8bfd7310e60582efe8d585e0df29 Mon Sep 17 00:00:00 2001 From: Aria Edmonds Date: Sat, 9 Jun 2018 22:01:09 +1000 Subject: [PATCH] Move +parinfer to :editor parinfer --- init.example.el | 6 ++++-- .../emacs-lisp/+parinfer.el => editor/parinfer/config.el} | 6 +++++- modules/editor/parinfer/packages.el | 4 ++++ modules/lang/emacs-lisp/config.el | 2 -- modules/lang/emacs-lisp/packages.el | 3 --- 5 files changed, 13 insertions(+), 8 deletions(-) rename modules/{lang/emacs-lisp/+parinfer.el => editor/parinfer/config.el} (80%) create mode 100644 modules/editor/parinfer/packages.el diff --git a/init.example.el b/init.example.el index c272bcd19..b57ab2566 100644 --- a/init.example.el +++ b/init.example.el @@ -75,8 +75,7 @@ ;erlang ; an elegant language for a more civilized age ;elixir ; erlang done right ;elm ; care for a cup of TEA? - (emacs-lisp ; drown in parentheses - +parinfer) ; A handy addon to sort of turn lisp into python + emacs-lisp ; drown in parentheses ;ess ; emacs speaks statistics ;go ; the hipster dialect ;(haskell +intero) ; a language that's lazier than I am @@ -128,6 +127,9 @@ ;floobits ; peer programming for a price ;impatient-mode ; show off code over HTTP + :editor + parinfer ; A handy addon to sort of turn lisp into python + :config ;; For literate config users. This will tangle+compile a config.org ;; literate config in your `doom-private-dir' whenever it changes. diff --git a/modules/lang/emacs-lisp/+parinfer.el b/modules/editor/parinfer/config.el similarity index 80% rename from modules/lang/emacs-lisp/+parinfer.el rename to modules/editor/parinfer/config.el index 60a6f4d98..4da768520 100644 --- a/modules/lang/emacs-lisp/+parinfer.el +++ b/modules/editor/parinfer/config.el @@ -4,7 +4,11 @@ (def-package! parinfer :commands (parinfer-mode) :init - (add-hook! emacs-lisp-mode + (add-hook! (emacs-lisp-mode + clojure-mode + common-lisp-mode + scheme-mode + lisp-mode) (yas-minor-mode -1) (parinfer-mode)) (setq parinfer-extensions diff --git a/modules/editor/parinfer/packages.el b/modules/editor/parinfer/packages.el new file mode 100644 index 000000000..56af803d7 --- /dev/null +++ b/modules/editor/parinfer/packages.el @@ -0,0 +1,4 @@ +;; -*- no-byte-compile: t; -*- +;;; editor/parinfer/packages.el + +(package! parinfer) diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 20d7077e1..dc395d0e5 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -116,5 +116,3 @@ (def-project-mode! +emacs-lisp-ert-mode :modes (emacs-lisp-mode) :match "/test[/-].+\\.el$") - -(when (featurep! +parinfer) (load! "+parinfer")) diff --git a/modules/lang/emacs-lisp/packages.el b/modules/lang/emacs-lisp/packages.el index 07f484dd9..24b02c21b 100644 --- a/modules/lang/emacs-lisp/packages.el +++ b/modules/lang/emacs-lisp/packages.el @@ -9,6 +9,3 @@ (when (featurep! :feature syntax-checker) (package! flycheck-cask)) - -(when (featurep! +parinfer) - (package! parinfer))