Make default private layer directory explicit
This commit is contained in:
parent
e1eed07c30
commit
252f26d555
|
@ -43,6 +43,17 @@
|
||||||
(expand-file-name (concat user-emacs-directory "private/"))
|
(expand-file-name (concat user-emacs-directory "private/"))
|
||||||
"Spacemacs private layers base directory.")
|
"Spacemacs private layers base directory.")
|
||||||
|
|
||||||
|
(defconst configuration-layer-private-layer-directory
|
||||||
|
(let ((dotspacemacs-layer-dir
|
||||||
|
(when dotspacemacs-directory
|
||||||
|
(expand-file-name
|
||||||
|
(concat dotspacemacs-directory "layers/")))))
|
||||||
|
(if (and dotspacemacs-directory
|
||||||
|
(file-exists-p dotspacemacs-layer-dir))
|
||||||
|
dotspacemacs-layer-dir
|
||||||
|
configuration-layer-private-directory))
|
||||||
|
"Spacemacs default directory for private layers.")
|
||||||
|
|
||||||
(defconst configuration-layer-rollback-directory
|
(defconst configuration-layer-rollback-directory
|
||||||
(expand-file-name (concat spacemacs-cache-directory ".rollback/"))
|
(expand-file-name (concat spacemacs-cache-directory ".rollback/"))
|
||||||
"Spacemacs rollback directory.")
|
"Spacemacs rollback directory.")
|
||||||
|
@ -118,7 +129,7 @@ layer directory."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let* ((current-layer-paths (mapcar (lambda (dir) (expand-file-name dir))
|
(let* ((current-layer-paths (mapcar (lambda (dir) (expand-file-name dir))
|
||||||
(cl-pushnew
|
(cl-pushnew
|
||||||
configuration-layer-private-directory
|
configuration-layer-private-layer-directory
|
||||||
dotspacemacs-configuration-layer-path)))
|
dotspacemacs-configuration-layer-path)))
|
||||||
(other-choice "Another directory...")
|
(other-choice "Another directory...")
|
||||||
(helm-lp-source
|
(helm-lp-source
|
||||||
|
@ -152,7 +163,7 @@ layer directory."
|
||||||
(defun configuration-layer//get-private-layer-dir (name)
|
(defun configuration-layer//get-private-layer-dir (name)
|
||||||
"Return an absolute path the the private configuration layer with name
|
"Return an absolute path the the private configuration layer with name
|
||||||
NAME."
|
NAME."
|
||||||
(concat configuration-layer-private-directory name "/"))
|
(concat configuration-layer-private-layer-directory name "/"))
|
||||||
|
|
||||||
(defun configuration-layer//copy-template (template &optional layer-dir)
|
(defun configuration-layer//copy-template (template &optional layer-dir)
|
||||||
"Copy and replace special values of TEMPLATE to LAYER_DIR. If
|
"Copy and replace special values of TEMPLATE to LAYER_DIR. If
|
||||||
|
@ -213,7 +224,7 @@ path."
|
||||||
;; `dotspacemacs-directory' override the private directory if it exists.
|
;; `dotspacemacs-directory' override the private directory if it exists.
|
||||||
(let ((search-paths (append (list configuration-layer-contrib-directory)
|
(let ((search-paths (append (list configuration-layer-contrib-directory)
|
||||||
dotspacemacs-configuration-layer-path
|
dotspacemacs-configuration-layer-path
|
||||||
(list configuration-layer-private-directory)
|
(list configuration-layer-private-layer-directory)
|
||||||
(list dotspacemacs-directory)))
|
(list dotspacemacs-directory)))
|
||||||
(discovered '())
|
(discovered '())
|
||||||
(result (make-hash-table :size 256)))
|
(result (make-hash-table :size 256)))
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
(defconst dotspacemacs-directory
|
(defconst dotspacemacs-directory
|
||||||
(let* ((env (getenv "SPACEMACSDIR"))
|
(let* ((env (getenv "SPACEMACSDIR"))
|
||||||
(env-dir (if env (expand-file-name (concat env "/"))))
|
(env-dir (when env (expand-file-name (concat env "/"))))
|
||||||
(no-env-dir-default (expand-file-name
|
(no-env-dir-default (expand-file-name
|
||||||
(concat user-home-directory
|
(concat user-home-directory
|
||||||
".spacemacs.d/"))))
|
".spacemacs.d/"))))
|
||||||
|
@ -33,7 +33,7 @@ directories exist, this variable will be nil.")
|
||||||
|
|
||||||
(defconst dotspacemacs-filepath
|
(defconst dotspacemacs-filepath
|
||||||
(let* ((default (concat user-home-directory ".spacemacs"))
|
(let* ((default (concat user-home-directory ".spacemacs"))
|
||||||
(spacemacs-dir-init (if dotspacemacs-directory
|
(spacemacs-dir-init (when dotspacemacs-directory
|
||||||
(concat dotspacemacs-directory
|
(concat dotspacemacs-directory
|
||||||
"init.el"))))
|
"init.el"))))
|
||||||
(if (and (not (file-exists-p default))
|
(if (and (not (file-exists-p default))
|
||||||
|
|
Loading…
Reference in a new issue