Move elisp -> contrib

This commit is contained in:
Henrik Lissner 2015-05-08 03:05:55 -04:00
parent 5316ea4ce2
commit 50cbf1fdaa
17 changed files with 11 additions and 10 deletions

View file

@ -11,4 +11,4 @@ clean:
autoloads: autoloads:
@rm -rf core/autoloads.el @rm -rf core/autoloads.el
@cask exec ${EMACS} -Q --batch --eval '(progn (setq generated-autoload-file "~/.emacs.d/core/autoloads.el") (update-directory-autoloads "~/.emacs.d/init" "~/.emacs.d/core" "~/.emacs.d/elisp"))' @cask exec ${EMACS} -Q --batch --eval '(progn (setq generated-autoload-file "~/.emacs.d/core/autoloads.el") (update-directory-autoloads "~/.emacs.d/init" "~/.emacs.d/core" "~/.emacs.d/contrib"))'

View file

@ -21,7 +21,7 @@
(defconst my-dir user-emacs-directory) (defconst my-dir user-emacs-directory)
(defconst my-core-dir (concat my-dir "core/")) (defconst my-core-dir (concat my-dir "core/"))
(defconst my-modules-dir (concat my-dir "init/")) (defconst my-modules-dir (concat my-dir "init/"))
(defconst my-elisp-dir (concat my-dir "elisp/")) (defconst my-contrib-dir (concat my-dir "contrib/"))
(defconst my-themes-dir (concat my-dir "themes/")) (defconst my-themes-dir (concat my-dir "themes/"))
(defconst my-snippets-dir (concat my-dir "snippets/")) (defconst my-snippets-dir (concat my-dir "snippets/"))
(defconst my-tmp-dir (concat my-dir ".cache/")) (defconst my-tmp-dir (concat my-dir ".cache/"))
@ -35,10 +35,10 @@
(add-to-list 'load-path my-core-dir) (add-to-list 'load-path my-core-dir)
(add-to-list 'load-path my-modules-dir) (add-to-list 'load-path my-modules-dir)
(add-to-list 'load-path my-elisp-dir) (add-to-list 'load-path my-contrib-dir)
;; Add elisp dirs to load-path ;; Add elisp dirs to load-path
(let ((default-directory my-elisp-dir)) (let ((default-directory my-contrib-dir))
(normal-top-level-add-subdirs-to-load-path)) (normal-top-level-add-subdirs-to-load-path))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

View file

@ -1,12 +1,13 @@
(use-package rust-mode (use-package rust-mode
:mode "\\.rs$" :mode "\\.rs$"
:config :config
(after "company" ;; (after "company"
(let ((racer-dir (concat my-elisp-dir "racer/"))) ;; (let ((racer-dir (concat my-contrib-dir "racer/")))
(setq racer-rust-src-path (concat racer-dir "src")) ;; (setq racer-rust-src-path (concat racer-dir "src"))
(setq racer-cmd (concat racer-dir "bin/racer")) ;; (setq racer-cmd (concat racer-dir "bin/racer"))
(add-to-list 'load-path (concat racer-dir "editors/")) ;; (add-to-list 'load-path (concat racer-dir "editors/"))
(require 'racer)))) ;; (require 'racer)))
)
(provide 'init-rust) (provide 'init-rust)
;;; init-rust.el ends here ;;; init-rust.el ends here