Merge remote-tracking branch 'origin/develop'
This commit is contained in:
12
setup.el
12
setup.el
@@ -16,8 +16,7 @@
|
|||||||
(list)))
|
(list)))
|
||||||
(advice-add 'straight-use-recipes
|
(advice-add 'straight-use-recipes
|
||||||
:override (lambda (&rest r)
|
:override (lambda (&rest r)
|
||||||
(message "straight-use-recipes %s" r)
|
(message "straight-use-recipes %s" r)))
|
||||||
))
|
|
||||||
|
|
||||||
(load init-file nil nil t)
|
(load init-file nil nil t)
|
||||||
(princ (if (null nix-straight--packages)
|
(princ (if (null nix-straight--packages)
|
||||||
@@ -33,10 +32,11 @@
|
|||||||
(advice-add 'straight-recipes-retrieve
|
(advice-add 'straight-recipes-retrieve
|
||||||
:override (lambda (pkg &rest r)
|
:override (lambda (pkg &rest r)
|
||||||
(message " Crafting recipe %s" pkg)
|
(message " Crafting recipe %s" pkg)
|
||||||
(if (file-exists-p (straight--repos-dir (format "%s" pkg)))
|
(let ((pkg-name (symbol-name pkg)))
|
||||||
`(,pkg :local-repo ,(format "%s" pkg))
|
(if (file-exists-p (straight--repos-dir pkg-name))
|
||||||
(message " --> Repo directory for package not exists, assuming built-in; %s" pkg)
|
(list pkg :local-repo pkg-name :repo pkg-name :type 'git)
|
||||||
`(,pkg :type built-in))))
|
(message " --> Repo directory for package not exists, assuming built-in; %s" pkg)
|
||||||
|
(list pkg :type 'built-in)))))
|
||||||
(load init-file nil nil t))
|
(load init-file nil nil t))
|
||||||
|
|
||||||
(provide 'setup)
|
(provide 'setup)
|
||||||
|
Reference in New Issue
Block a user