From 303e76b7698e1e4a37d61b0c980b0499f558008b Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Fri, 27 May 2016 00:22:47 -0400 Subject: [PATCH] remove remaining packages-funcs.el and packages-config.el --- layers/+lang/bibtex/packages.el | 2 - .../elixir/{packages-funcs.el => funcs.el} | 2 +- layers/+lang/elixir/packages-config.el | 125 ------------------ layers/+lang/elixir/packages.el | 115 ++++++++++++++++ .../+lang/elm/{packages-funcs.el => funcs.el} | 2 +- layers/+lang/elm/packages-config.el | 97 -------------- layers/+lang/elm/packages.el | 86 ++++++++++++ .../{packages-funcs.el => funcs.el} | 2 +- .../+web-services/elfeed/packages-config.el | 61 --------- layers/+web-services/elfeed/packages.el | 50 +++++++ 10 files changed, 254 insertions(+), 288 deletions(-) rename layers/+lang/elixir/{packages-funcs.el => funcs.el} (83%) delete mode 100644 layers/+lang/elixir/packages-config.el rename layers/+lang/elm/{packages-funcs.el => funcs.el} (92%) delete mode 100644 layers/+lang/elm/packages-config.el rename layers/+spacemacs/spacemacs-editing/{packages-funcs.el => funcs.el} (89%) delete mode 100644 layers/+web-services/elfeed/packages-config.el diff --git a/layers/+lang/bibtex/packages.el b/layers/+lang/bibtex/packages.el index f21706b3b..d23664da2 100644 --- a/layers/+lang/bibtex/packages.el +++ b/layers/+lang/bibtex/packages.el @@ -74,5 +74,3 @@ (defun bibtex/post-init-markdown-mode () (spacemacs/set-leader-keys-for-major-mode 'markdown-mode "ic" 'org-ref-helm-insert-cite-link)) - -;;; packages-config.el ends here diff --git a/layers/+lang/elixir/packages-funcs.el b/layers/+lang/elixir/funcs.el similarity index 83% rename from layers/+lang/elixir/packages-funcs.el rename to layers/+lang/elixir/funcs.el index ed860a218..3d50780e1 100644 --- a/layers/+lang/elixir/packages-funcs.el +++ b/layers/+lang/elixir/funcs.el @@ -1,4 +1,4 @@ -;;; packages-funcs.el --- Elixir Layer packages functions File for Spacemacs +;;; funcs.el --- Elixir Layer functions File for Spacemacs ;; ;; Copyright (c) 2012-2016 Sylvain Benner & Contributors ;; diff --git a/layers/+lang/elixir/packages-config.el b/layers/+lang/elixir/packages-config.el deleted file mode 100644 index e64a13c60..000000000 --- a/layers/+lang/elixir/packages-config.el +++ /dev/null @@ -1,125 +0,0 @@ -;;; packages-config.el --- Elixir Layer packages configuration File for Spacemacs -;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors -;; -;; Author: Sylvain Benner -;; URL: https://github.com/syl20bnr/spacemacs -;; -;; This file is not part of GNU Emacs. -;; -;;; License: GPLv3 - -(defun elixir/init-alchemist () - (use-package alchemist - :defer t - :init - (progn - (spacemacs/register-repl 'alchemist 'alchemist-iex-run "alchemist") - (add-hook 'elixir-mode-hook 'alchemist-mode) - (setq alchemist-project-compile-when-needed t) - (push 'alchemist-company company-backends-elixir-mode) - (push 'alchemist-company company-backends-alchemist-iex-mode)) - :config - (spacemacs/declare-prefix-for-mode 'elixir-mode "mc" "compile") - (spacemacs/declare-prefix-for-mode 'elixir-mode "me" "eval") - (spacemacs/declare-prefix-for-mode 'elixir-mode "mp" "project") - (spacemacs/declare-prefix-for-mode 'elixir-mode "mh" "help") - (spacemacs/declare-prefix-for-mode 'elixir-mode "mt" "test") - (spacemacs/declare-prefix-for-mode 'elixir-mode "ms" "iex") - (spacemacs/declare-prefix-for-mode 'elixir-mode "mm" "mix") - (spacemacs/declare-prefix-for-mode 'elixir-mode "mx" "execute") - (spacemacs/declare-prefix-for-mode 'elixir-mode "mg" "goto") - (spacemacs/set-leader-keys-for-major-mode 'elixir-mode - "el" 'alchemist-eval-current-line - "eL" 'alchemist-eval-print-current-line - "er" 'alchemist-eval-region - "eR" 'alchemist-eval-print-region - "eb" 'alchemist-eval-buffer - "eB" 'alchemist-eval-print-buffer - "ej" 'alchemist-eval-quoted-current-line - "eJ" 'alchemist-eval-print-quoted-current-line - "eu" 'alchemist-eval-quoted-region - "eU" 'alchemist-eval-print-quoted-region - "ev" 'alchemist-eval-quoted-buffer - "eV" 'alchemist-eval-print-quoted-buffer - - "pt" 'alchemist-project-find-test - "gt" 'alchemist-project-toggle-file-and-tests - "gT" 'alchemist-project-toggle-file-and-tests-other-window - - "h:" 'alchemist-help - "hH" 'alchemist-help-history - "hh" 'alchemist-help-search-at-point - "hr" 'alchemist-help-search-marked-region - - "m:" 'alchemist-mix - "mc" 'alchemist-mix-compile - "mx" 'alchemist-mix-run - "mh" 'alchemist-mix-help - - "'" 'alchemist-iex-run - "sc" 'alchemist-iex-compile-this-buffer - "si" 'alchemist-iex-run - "sI" 'alchemist-iex-project-run - "sl" 'alchemist-iex-send-current-line - "sL" 'alchemist-iex-send-current-line-and-go - "sm" 'alchemist-iex-reload-module - "sr" 'alchemist-iex-send-region - "sR" 'alchemist-iex-send-region-and-go - - "ta" 'alchemist-mix-test - "tb" 'alchemist-mix-test-this-buffer - "tt" 'alchemist-mix-test-at-point - "tf" 'alchemist-test-file - "tn" 'alchemist-test-jump-to-next-test - "tp" 'alchemist-test-jump-to-previous-test - "tr" 'alchemist-mix-rerun-last-test - - "xb" 'alchemist-execute-this-buffer - "xf" 'alchemist-execute-file - "x:" 'alchemist-execute - - "cb" 'alchemist-compile-this-buffer - "cf" 'alchemist-compile-file - "c:" 'alchemist-compile - - "gg" 'alchemist-goto-definition-at-point - "," 'alchemist-goto-jump-back) - - (dolist (mode (list alchemist-compile-mode-map - alchemist-eval-mode-map - alchemist-execute-mode-map - alchemist-message-mode-map - alchemist-help-minor-mode-map - alchemist-mix-mode-map - alchemist-macroexpand-mode-map - alchemist-refcard-mode-map - alchemist-test-report-mode-map)) - (evil-define-key 'normal mode - (kbd "q") 'quit-window)))) - -(defun elixir/post-init-company () - (spacemacs|add-company-hook elixir-mode) - (spacemacs|add-company-hook alchemist-iex-mode)) - -(defun elixir/post-init-smartparens () - (sp-with-modes '(elixir-mode) - (sp-local-pair "->" "end" - :when '(("RET")) - :post-handlers '(:add spacemacs//elixir-do-end-close-action) - :actions '(insert))) - - (sp-with-modes '(elixir-mode) - (sp-local-pair "do" "end" - :when '(("SPC" "RET")) - :post-handlers '(:add spacemacs//elixir-do-end-close-action) - :actions '(insert)))) - -(defun elixir/init-elixir-mode () - (use-package elixir-mode - :defer t)) - -(defun elixir/pre-init-popwin () - (spacemacs|use-package-add-hook popwin - :post-config - (push '("*mix*" :tail t :noselect t) popwin:special-display-config))) diff --git a/layers/+lang/elixir/packages.el b/layers/+lang/elixir/packages.el index e13dd5fe6..88cda9082 100644 --- a/layers/+lang/elixir/packages.el +++ b/layers/+lang/elixir/packages.el @@ -17,3 +17,118 @@ popwin smartparens )) + +(defun elixir/init-alchemist () + (use-package alchemist + :defer t + :init + (progn + (spacemacs/register-repl 'alchemist 'alchemist-iex-run "alchemist") + (add-hook 'elixir-mode-hook 'alchemist-mode) + (setq alchemist-project-compile-when-needed t) + (push 'alchemist-company company-backends-elixir-mode) + (push 'alchemist-company company-backends-alchemist-iex-mode)) + :config + (spacemacs/declare-prefix-for-mode 'elixir-mode "mc" "compile") + (spacemacs/declare-prefix-for-mode 'elixir-mode "me" "eval") + (spacemacs/declare-prefix-for-mode 'elixir-mode "mp" "project") + (spacemacs/declare-prefix-for-mode 'elixir-mode "mh" "help") + (spacemacs/declare-prefix-for-mode 'elixir-mode "mt" "test") + (spacemacs/declare-prefix-for-mode 'elixir-mode "ms" "iex") + (spacemacs/declare-prefix-for-mode 'elixir-mode "mm" "mix") + (spacemacs/declare-prefix-for-mode 'elixir-mode "mx" "execute") + (spacemacs/declare-prefix-for-mode 'elixir-mode "mg" "goto") + (spacemacs/set-leader-keys-for-major-mode 'elixir-mode + "el" 'alchemist-eval-current-line + "eL" 'alchemist-eval-print-current-line + "er" 'alchemist-eval-region + "eR" 'alchemist-eval-print-region + "eb" 'alchemist-eval-buffer + "eB" 'alchemist-eval-print-buffer + "ej" 'alchemist-eval-quoted-current-line + "eJ" 'alchemist-eval-print-quoted-current-line + "eu" 'alchemist-eval-quoted-region + "eU" 'alchemist-eval-print-quoted-region + "ev" 'alchemist-eval-quoted-buffer + "eV" 'alchemist-eval-print-quoted-buffer + + "pt" 'alchemist-project-find-test + "gt" 'alchemist-project-toggle-file-and-tests + "gT" 'alchemist-project-toggle-file-and-tests-other-window + + "h:" 'alchemist-help + "hH" 'alchemist-help-history + "hh" 'alchemist-help-search-at-point + "hr" 'alchemist-help-search-marked-region + + "m:" 'alchemist-mix + "mc" 'alchemist-mix-compile + "mx" 'alchemist-mix-run + "mh" 'alchemist-mix-help + + "'" 'alchemist-iex-run + "sc" 'alchemist-iex-compile-this-buffer + "si" 'alchemist-iex-run + "sI" 'alchemist-iex-project-run + "sl" 'alchemist-iex-send-current-line + "sL" 'alchemist-iex-send-current-line-and-go + "sm" 'alchemist-iex-reload-module + "sr" 'alchemist-iex-send-region + "sR" 'alchemist-iex-send-region-and-go + + "ta" 'alchemist-mix-test + "tb" 'alchemist-mix-test-this-buffer + "tt" 'alchemist-mix-test-at-point + "tf" 'alchemist-test-file + "tn" 'alchemist-test-jump-to-next-test + "tp" 'alchemist-test-jump-to-previous-test + "tr" 'alchemist-mix-rerun-last-test + + "xb" 'alchemist-execute-this-buffer + "xf" 'alchemist-execute-file + "x:" 'alchemist-execute + + "cb" 'alchemist-compile-this-buffer + "cf" 'alchemist-compile-file + "c:" 'alchemist-compile + + "gg" 'alchemist-goto-definition-at-point + "," 'alchemist-goto-jump-back) + + (dolist (mode (list alchemist-compile-mode-map + alchemist-eval-mode-map + alchemist-execute-mode-map + alchemist-message-mode-map + alchemist-help-minor-mode-map + alchemist-mix-mode-map + alchemist-macroexpand-mode-map + alchemist-refcard-mode-map + alchemist-test-report-mode-map)) + (evil-define-key 'normal mode + (kbd "q") 'quit-window)))) + +(defun elixir/post-init-company () + (spacemacs|add-company-hook elixir-mode) + (spacemacs|add-company-hook alchemist-iex-mode)) + +(defun elixir/post-init-smartparens () + (sp-with-modes '(elixir-mode) + (sp-local-pair "->" "end" + :when '(("RET")) + :post-handlers '(:add spacemacs//elixir-do-end-close-action) + :actions '(insert))) + + (sp-with-modes '(elixir-mode) + (sp-local-pair "do" "end" + :when '(("SPC" "RET")) + :post-handlers '(:add spacemacs//elixir-do-end-close-action) + :actions '(insert)))) + +(defun elixir/init-elixir-mode () + (use-package elixir-mode + :defer t)) + +(defun elixir/pre-init-popwin () + (spacemacs|use-package-add-hook popwin + :post-config + (push '("*mix*" :tail t :noselect t) popwin:special-display-config))) diff --git a/layers/+lang/elm/packages-funcs.el b/layers/+lang/elm/funcs.el similarity index 92% rename from layers/+lang/elm/packages-funcs.el rename to layers/+lang/elm/funcs.el index 36b20cae6..722a8444e 100644 --- a/layers/+lang/elm/packages-funcs.el +++ b/layers/+lang/elm/funcs.el @@ -1,4 +1,4 @@ -;;; packages-funcs.el --- Elm Layer packages functions File for Spacemacs +;;; funcs.el --- Elm Layer functions File for Spacemacs ;; ;; Copyright (c) 2012-2016 Sylvain Benner & Contributors ;; diff --git a/layers/+lang/elm/packages-config.el b/layers/+lang/elm/packages-config.el deleted file mode 100644 index 7b4770a09..000000000 --- a/layers/+lang/elm/packages-config.el +++ /dev/null @@ -1,97 +0,0 @@ -;;; packages-config.el --- Elm Layer packages configuration File for Spacemacs -;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors -;; -;; Author: Sylvain Benner -;; URL: https://github.com/syl20bnr/spacemacs -;; -;; This file is not part of GNU Emacs. -;; -;;; License: GPLv3 - -(defun elm/post-init-company () - (spacemacs|add-company-hook elm-mode) - (add-hook 'elm-mode-hook 'elm-oracle-setup-completion)) - -(defun elm/post-init-flycheck () - (add-hook 'elm-mode-hook 'flycheck-mode) - (add-hook 'elm-mode-hook 'spacemacs//elm-find-root)) - -(when (configuration-layer/package-usedp 'flycheck) - (defun elm/init-flycheck-elm () - "Initialize flycheck-elm" - (use-package flycheck-elm - :defer t - :init (add-hook 'flycheck-mode-hook 'flycheck-elm-setup t)))) - -(defun elm/init-elm-mode () - "Initialize elm-mode" - (use-package elm-mode - :mode ("\\.elm\\'" . elm-mode) - :init - (progn - (spacemacs/register-repl 'elm-mode 'elm-repl-load "elm") - - (defun spacemacs/init-elm-mode () - "Disable electric-indent-mode and let indentation cycling feature work" - (if (fboundp 'electric-indent-local-mode) - (electric-indent-local-mode -1))) - - (add-hook 'elm-mode-hook 'spacemacs/init-elm-mode)) - :config - (progn - (push "\\*elm\\*" spacemacs-useful-buffers-regexp) - - (spacemacs/set-leader-keys-for-major-mode 'elm-mode - ;; make - "cb" 'elm-compile-buffer - "cB" 'spacemacs/elm-compile-buffer-output - "cm" 'elm-compile-main - - ;; oracle - "ht" 'elm-oracle-type-at-point - - ;; repl - "'" 'elm-repl-load - "si" 'elm-repl-load - "sf" 'elm-repl-push-decl - "sF" 'spacemacs/elm-repl-push-decl-focus - "sr" 'elm-repl-push - "sR" 'spacemacs/elm-repl-push-focus - - ;; reactor - "Rn" 'elm-preview-buffer - "Rm" 'elm-preview-main - - ;; package - "pi" 'elm-import - "pc" 'elm-package-catalog - "pd" 'elm-documentation-lookup) - - (dolist (x '(("mR" . "reactor") - ("mc" . "compile") - ("mh" . "help") - ("mp" . "package") - ("ms" . "repl"))) - (spacemacs/declare-prefix-for-mode 'elm-mode (car x) (cdr x))) - - (evilified-state-evilify elm-package-mode elm-package-mode-map - "g" 'elm-package-refresh - "n" 'elm-package-next - "p" 'elm-package-prev - "v" 'elm-package-view - "m" 'elm-package-mark - "u" 'elm-package-unmark - "x" 'elm-package-install - "q" 'quit-window)))) - -(defun elm/pre-init-popwin () - (spacemacs|use-package-add-hook popwin - :post-config - (push '("*elm*" :tail t :noselect t) popwin:special-display-config) - (push '("*elm-make*" :tail t :noselect t) popwin:special-display-config))) - -(defun elm/post-init-smartparens () - (if dotspacemacs-smartparens-strict-mode - (add-hook 'elm-mode-hook #'smartparens-strict-mode) - (add-hook 'elm-mode-hook #'smartparens-mode))) diff --git a/layers/+lang/elm/packages.el b/layers/+lang/elm/packages.el index 457765c4f..3f6a8861a 100644 --- a/layers/+lang/elm/packages.el +++ b/layers/+lang/elm/packages.el @@ -19,3 +19,89 @@ smartparens )) +(defun elm/post-init-company () + (spacemacs|add-company-hook elm-mode) + (add-hook 'elm-mode-hook 'elm-oracle-setup-completion)) + +(defun elm/post-init-flycheck () + (add-hook 'elm-mode-hook 'flycheck-mode) + (add-hook 'elm-mode-hook 'spacemacs//elm-find-root)) + +(when (configuration-layer/package-usedp 'flycheck) + (defun elm/init-flycheck-elm () + "Initialize flycheck-elm" + (use-package flycheck-elm + :defer t + :init (add-hook 'flycheck-mode-hook 'flycheck-elm-setup t)))) + +(defun elm/init-elm-mode () + "Initialize elm-mode" + (use-package elm-mode + :mode ("\\.elm\\'" . elm-mode) + :init + (progn + (spacemacs/register-repl 'elm-mode 'elm-repl-load "elm") + + (defun spacemacs/init-elm-mode () + "Disable electric-indent-mode and let indentation cycling feature work" + (if (fboundp 'electric-indent-local-mode) + (electric-indent-local-mode -1))) + + (add-hook 'elm-mode-hook 'spacemacs/init-elm-mode)) + :config + (progn + (push "\\*elm\\*" spacemacs-useful-buffers-regexp) + + (spacemacs/set-leader-keys-for-major-mode 'elm-mode + ;; make + "cb" 'elm-compile-buffer + "cB" 'spacemacs/elm-compile-buffer-output + "cm" 'elm-compile-main + + ;; oracle + "ht" 'elm-oracle-type-at-point + + ;; repl + "'" 'elm-repl-load + "si" 'elm-repl-load + "sf" 'elm-repl-push-decl + "sF" 'spacemacs/elm-repl-push-decl-focus + "sr" 'elm-repl-push + "sR" 'spacemacs/elm-repl-push-focus + + ;; reactor + "Rn" 'elm-preview-buffer + "Rm" 'elm-preview-main + + ;; package + "pi" 'elm-import + "pc" 'elm-package-catalog + "pd" 'elm-documentation-lookup) + + (dolist (x '(("mR" . "reactor") + ("mc" . "compile") + ("mh" . "help") + ("mp" . "package") + ("ms" . "repl"))) + (spacemacs/declare-prefix-for-mode 'elm-mode (car x) (cdr x))) + + (evilified-state-evilify elm-package-mode elm-package-mode-map + "g" 'elm-package-refresh + "n" 'elm-package-next + "p" 'elm-package-prev + "v" 'elm-package-view + "m" 'elm-package-mark + "u" 'elm-package-unmark + "x" 'elm-package-install + "q" 'quit-window)))) + +(defun elm/pre-init-popwin () + (spacemacs|use-package-add-hook popwin + :post-config + (push '("*elm*" :tail t :noselect t) popwin:special-display-config) + (push '("*elm-make*" :tail t :noselect t) popwin:special-display-config))) + +(defun elm/post-init-smartparens () + (if dotspacemacs-smartparens-strict-mode + (add-hook 'elm-mode-hook #'smartparens-strict-mode) + (add-hook 'elm-mode-hook #'smartparens-mode))) diff --git a/layers/+spacemacs/spacemacs-editing/packages-funcs.el b/layers/+spacemacs/spacemacs-editing/funcs.el similarity index 89% rename from layers/+spacemacs/spacemacs-editing/packages-funcs.el rename to layers/+spacemacs/spacemacs-editing/funcs.el index 79b3598d6..8c4dfc5f8 100644 --- a/layers/+spacemacs/spacemacs-editing/packages-funcs.el +++ b/layers/+spacemacs/spacemacs-editing/funcs.el @@ -1,4 +1,4 @@ -;;; packages-funcs.el --- Spacemacs editing Layer packages functions File for Spacemacs +;;; funcs.el --- Spacemacs editing Layer functions File ;; ;; Copyright (c) 2012-2016 Sylvain Benner & Contributors ;; diff --git a/layers/+web-services/elfeed/packages-config.el b/layers/+web-services/elfeed/packages-config.el deleted file mode 100644 index 592462c73..000000000 --- a/layers/+web-services/elfeed/packages-config.el +++ /dev/null @@ -1,61 +0,0 @@ -;;; packages-config el --- elfeed Layer packages figuration File for Spacemacs -;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors -;; -;; Author: Sylvain Benner -;; URL: https://github.com/syl20bnr/spacemacs -;; -;; This file is not part of GNU Emacs. -;; -;;; License: GPLv3 - -(defun elfeed/init-elfeed () - (use-package elfeed - :defer t - :init (spacemacs/set-leader-keys "af" 'elfeed) - :config - (progn - (evilified-state-evilify-map elfeed-search-mode-map - :mode elfeed-search-mode - :eval-after-load elfeed-search - :bindings - "c" 'elfeed-db-compact - "gr" 'elfeed-update - "gR" 'elfeed-search-update--force - "gu" 'elfeed-unjam - "o" 'elfeed-load-opml - "q" 'quit-window - "w" 'elfeed-web-start - "W" 'elfeed-web-stop) - (evilified-state-evilify-map elfeed-show-mode-map - :mode elfeed-show-mode - :eval-after-load elfeed-show - :bindings - "q" 'quit-window - (kbd "C-j") 'elfeed-show-next - (kbd "C-k") 'elfeed-show-prev)))) - -(defun elfeed/init-elfeed-goodies () - (use-package elfeed-goodies - :commands elfeed-goodies/setup - :init (spacemacs|use-package-add-hook elfeed - :post-config (progn - (elfeed-goodies/setup) - (evil-define-key 'evilified elfeed-show-mode-map "o" 'elfeed-goodies/show-ace-link))))) - -(defun elfeed/init-elfeed-org () - (use-package elfeed-org - :defer t - :if (boundp 'rmh-elfeed-org-files) - :init (spacemacs|use-package-add-hook elfeed - :pre-config (elfeed-org)))) - -(defun elfeed/init-elfeed-web () - (use-package elfeed-web - :defer t - :commands elfeed-web-stop - :init (when elfeed-enable-web-interface - ;; TODO check if the port is already in use - ;; hack to force elfeed feature to be required before elfeed-search - (require 'elfeed) - (elfeed-web-start)))) diff --git a/layers/+web-services/elfeed/packages.el b/layers/+web-services/elfeed/packages.el index c935ab55b..5e31d5c59 100644 --- a/layers/+web-services/elfeed/packages.el +++ b/layers/+web-services/elfeed/packages.el @@ -16,3 +16,53 @@ elfeed-web )) +(defun elfeed/init-elfeed () + (use-package elfeed + :defer t + :init (spacemacs/set-leader-keys "af" 'elfeed) + :config + (progn + (evilified-state-evilify-map elfeed-search-mode-map + :mode elfeed-search-mode + :eval-after-load elfeed-search + :bindings + "c" 'elfeed-db-compact + "gr" 'elfeed-update + "gR" 'elfeed-search-update--force + "gu" 'elfeed-unjam + "o" 'elfeed-load-opml + "q" 'quit-window + "w" 'elfeed-web-start + "W" 'elfeed-web-stop) + (evilified-state-evilify-map elfeed-show-mode-map + :mode elfeed-show-mode + :eval-after-load elfeed-show + :bindings + "q" 'quit-window + (kbd "C-j") 'elfeed-show-next + (kbd "C-k") 'elfeed-show-prev)))) + +(defun elfeed/init-elfeed-goodies () + (use-package elfeed-goodies + :commands elfeed-goodies/setup + :init (spacemacs|use-package-add-hook elfeed + :post-config (progn + (elfeed-goodies/setup) + (evil-define-key 'evilified elfeed-show-mode-map "o" 'elfeed-goodies/show-ace-link))))) + +(defun elfeed/init-elfeed-org () + (use-package elfeed-org + :defer t + :if (boundp 'rmh-elfeed-org-files) + :init (spacemacs|use-package-add-hook elfeed + :pre-config (elfeed-org)))) + +(defun elfeed/init-elfeed-web () + (use-package elfeed-web + :defer t + :commands elfeed-web-stop + :init (when elfeed-enable-web-interface + ;; TODO check if the port is already in use + ;; hack to force elfeed feature to be required before elfeed-search + (require 'elfeed) + (elfeed-web-start))))