diff --git a/contribsys.el b/contribsys.el index b691d83a1..2b4be3a98 100644 --- a/contribsys.el +++ b/contribsys.el @@ -116,15 +116,13 @@ extension. (load init-file)))) (defun spacemacs/initialize-extensions (ext-list) - "Initialize all the declared in EXT-LIST hash table." + "Initialize all the declared extensions in EXT-LIST hash table." (ht-each 'spacemacs/initialize-extension ext-list)) (defun spacemacs/initialize-extension (ext lsym) "Initialize the extension EXT from the configuration layer LSYM." (let* ((layer (assq lsym spacemacs-config-layers)) (ext-dir (plist-get (cdr layer) :ext-dir)) - (init-dir (plist-get (cdr layer) :init-dir)) - (init-file (concat init-dir (format "init-%s.el" ext)))) - (add-to-list 'load-path (format "%s%s/" ext-dir ext)) - (if (file-exists-p init-file) - (load init-file)))) + (init-func (intern (format "%s/init-%s" (symbol-name lsym) ext)))) + (add-to-list 'load-path (format "%s%s/" ext-dir ext)) + (funcall init-func))) diff --git a/spacemacs/extensions.el b/spacemacs/extensions.el index c74d5dc45..78b3ccf50 100644 --- a/spacemacs/extensions.el +++ b/spacemacs/extensions.el @@ -19,3 +19,83 @@ pylookup solarized-theme )) + +;; Initialize the extensions + +(defun spacemacs/init-use-package () + (require 'use-package)) + +(defun spacemacs/init-centered-cursor () + (use-package centered-cursor-mode + :commands global-centered-cursor-mode + :init + (evil-leader/set-key "zz" 'global-centered-cursor-mode) + :config + (custom-set-variables + '(ccm-recenter-at-end-of-file t) + '(ccm-ignored-commands (quote (mouse-drag-region + mouse-set-point + widget-button-click + scroll-bar-toolkit-scroll + evil-mouse-drag-region)))))) + +(defun spacemacs/init-dos () + (use-package dos + :mode ("\\.bat$" . dos-mode))) + +(defun spacemacs/init-emoji-cheat-sheet () + (use-package emoji-cheat-sheet + :commands emoji-cheat-sheet)) + +(defun spacemacs/init-evil-org-mode () + (use-package evil-org + :commands evil-org-mode + :init (add-hook 'org-mode-hook 'evil-org-mode))) + +(defun spacemacs/init-evil-plugins () + (use-package evil-little-word) + (use-package evil-operator-comment + :init + (global-evil-operator-comment-mode 1))) + +(defun spacemacs/init-nose () + (use-package nose + :commands (nosetests-one + nosetests-pdb-one + nosetests-all + nosetests-pdb-all + nosetests-module + nosetests-pdb-module + nosetests-suite + nosetests-pdb-suite) + :config + (progn + (add-to-list 'nose-project-root-files "setup.cfg") + (setq nose-use-verbose nil)))) + +(defun spacemacs/init-o-blog () + (use-package o-blog + :defer t)) + +(defun spacemacs/init-pylookup () + (use-package pylookup + :commands pylookup-lookup + :config + (progn + (setq pylookup-dir (concat spacemacs-extensions-directory "/pylookup")) + ;; set executable file and db file + (setq pylookup-program (concat pylookup-dir "/pylookup.py")) + (setq pylookup-db-file (concat pylookup-dir "/pylookup.db"))))) + +(defun spacemacs/init-solarized-theme () + ;; different method used than the documented one in order to speed up the + ;; loading of emacs + (use-package solarized + :init + (progn + (deftheme solarized-light "The light variant of the Solarized colour theme") + (create-solarized-theme 'light 'solarized-light) + (deftheme solarized-dark "The dark variant of the Solarized colour theme") + (create-solarized-theme 'dark 'solarized-dark) + (spacemacs/set-flycheck-custom-face) + ))) diff --git a/spacemacs/init/init-centered-cursor.el b/spacemacs/init/init-centered-cursor.el deleted file mode 100644 index 4258c9a94..000000000 --- a/spacemacs/init/init-centered-cursor.el +++ /dev/null @@ -1,13 +0,0 @@ -(use-package centered-cursor-mode - :commands global-centered-cursor-mode - :init - (evil-leader/set-key "zz" 'global-centered-cursor-mode) - :config - (custom-set-variables - '(ccm-recenter-at-end-of-file t) - '(ccm-ignored-commands (quote (mouse-drag-region - mouse-set-point - widget-button-click - scroll-bar-toolkit-scroll - evil-mouse-drag-region)))) -) diff --git a/spacemacs/init/init-dos.el b/spacemacs/init/init-dos.el deleted file mode 100644 index b0444b91a..000000000 --- a/spacemacs/init/init-dos.el +++ /dev/null @@ -1,3 +0,0 @@ -(use-package dos - :mode ("\\.bat$" . dos-mode)) - diff --git a/spacemacs/init/init-emoji-cheat-sheet.el b/spacemacs/init/init-emoji-cheat-sheet.el deleted file mode 100644 index 96835d7a9..000000000 --- a/spacemacs/init/init-emoji-cheat-sheet.el +++ /dev/null @@ -1,2 +0,0 @@ -(use-package emoji-cheat-sheet - :commands emoji-cheat-sheet) diff --git a/spacemacs/init/init-evil-org-mode.el b/spacemacs/init/init-evil-org-mode.el deleted file mode 100644 index 712adaa12..000000000 --- a/spacemacs/init/init-evil-org-mode.el +++ /dev/null @@ -1,3 +0,0 @@ -(use-package evil-org - :commands evil-org-mode - :init (add-hook 'org-mode-hook 'evil-org-mode)) diff --git a/spacemacs/init/init-evil-plugins.el b/spacemacs/init/init-evil-plugins.el deleted file mode 100644 index 11cc41c27..000000000 --- a/spacemacs/init/init-evil-plugins.el +++ /dev/null @@ -1,5 +0,0 @@ -(use-package evil-little-word) - -(use-package evil-operator-comment - :init - (global-evil-operator-comment-mode 1)) diff --git a/spacemacs/init/init-nose.el b/spacemacs/init/init-nose.el deleted file mode 100644 index 71d31bfb8..000000000 --- a/spacemacs/init/init-nose.el +++ /dev/null @@ -1,13 +0,0 @@ -(use-package nose - :commands (nosetests-one - nosetests-pdb-one - nosetests-all - nosetests-pdb-all - nosetests-module - nosetests-pdb-module - nosetests-suite - nosetests-pdb-suite) - :config - (progn - (add-to-list 'nose-project-root-files "setup.cfg") - (setq nose-use-verbose nil))) diff --git a/spacemacs/init/init-o-blog.el b/spacemacs/init/init-o-blog.el deleted file mode 100644 index c614ca21e..000000000 --- a/spacemacs/init/init-o-blog.el +++ /dev/null @@ -1,2 +0,0 @@ -(use-package o-blog - :defer t) diff --git a/spacemacs/init/init-pylookup.el b/spacemacs/init/init-pylookup.el deleted file mode 100644 index 2ab86ba9c..000000000 --- a/spacemacs/init/init-pylookup.el +++ /dev/null @@ -1,8 +0,0 @@ -(use-package pylookup - :commands pylookup-lookup - :config - (progn - (setq pylookup-dir (concat spacemacs-extensions-directory "/pylookup")) - ;; set executable file and db file - (setq pylookup-program (concat pylookup-dir "/pylookup.py")) - (setq pylookup-db-file (concat pylookup-dir "/pylookup.db")))) diff --git a/spacemacs/init/init-solarized-theme.el b/spacemacs/init/init-solarized-theme.el deleted file mode 100644 index af6ec6839..000000000 --- a/spacemacs/init/init-solarized-theme.el +++ /dev/null @@ -1,12 +0,0 @@ -;; different method used than the documented one in order to speed up the -;; loading of emacs -(use-package solarized - :init - (progn - (deftheme solarized-light "The light variant of the Solarized colour theme") - (create-solarized-theme 'light 'solarized-light) - (deftheme solarized-dark "The dark variant of the Solarized colour theme") - (create-solarized-theme 'dark 'solarized-dark) - (spacemacs/set-flycheck-custom-face) -)) - diff --git a/spacemacs/init/init-use-package.el b/spacemacs/init/init-use-package.el deleted file mode 100644 index ea9dbdd29..000000000 --- a/spacemacs/init/init-use-package.el +++ /dev/null @@ -1 +0,0 @@ -(require 'use-package)