💥 Replace package.el/quelpa with straight #374

There are a few kinks to iron out, but for the most part it's done. Doom
Emacs, powered by straight. Goodbye gnutls and elpa/quelpa issues.

This update doesn't come with rollback or lockfile support yet, but I
will eventually include one with Doom, and packages will be (by default,
anyway) updated in sync with Doom.

Relevant threads: #1577 #1566 #1473
This commit is contained in:
Henrik Lissner
2019-07-21 15:39:45 +02:00
parent 492f2dea1e
commit b90dede1ab
35 changed files with 1542 additions and 1771 deletions

View File

@ -5,7 +5,7 @@
(package! helm-ag)
(package! helm-c-yasnippet)
(package! helm-company)
(package! helm-describe-modes :recipe (:fetcher github :repo "emacs-helm/helm-describe-modes"))
(package! helm-describe-modes :recipe (:host github :repo "emacs-helm/helm-describe-modes"))
(package! helm-projectile)
(package! swiper-helm)
(when (featurep! +fuzzy)

View File

@ -9,14 +9,13 @@
(package! evil-escape)
(package! evil-exchange)
(package! evil-indent-plus)
(package! evil-numbers :recipe (:fetcher github :repo "janpath/evil-numbers"))
(package! evil-numbers :recipe (:host github :repo "janpath/evil-numbers"))
(package! evil-textobj-anyblock)
(package! evil-snipe)
(package! evil-surround)
(package! evil-visualstar)
(package! exato)
;;
(when (featurep! +everywhere)
;; `evil-collection-neotree' uses the `neotree-make-executor' macro, but this

View File

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; editor/rotate-text/packages.el
(package! rotate-text :recipe (:fetcher github :repo "debug-ito/rotate-text.el"))
(package! rotate-text :recipe (:host github :repo "debug-ito/rotate-text.el"))

View File

@ -5,6 +5,6 @@
(package! auto-yasnippet)
(package! doom-snippets
:recipe (:fetcher github
:recipe (:host github
:repo "hlissner/doom-snippets"
:files ("*.el" "snippets")))

View File

@ -10,7 +10,7 @@
(when (package! glsl-mode)
(when (featurep! :completion company)
(package! company-glsl :recipe (:fetcher github :repo "Kaali/company-glsl"))))
(package! company-glsl :recipe (:host github :repo "Kaali/company-glsl"))))
(if (featurep! +lsp)
(package! ccls)

View File

@ -16,18 +16,8 @@
;; by default quelpa generated a version 0pre0.20180929.192844, which got
;; parsed into (0 -1 0 ...), which when compared with version nil (0) in
;; package-installed-p always yielded false
(package! ocamlformat :recipe (:fetcher github :repo "ocaml-ppx/ocamlformat" :files ("emacs/*.el"))))
(package! ocamlformat :recipe
(:host github :repo "ocaml-ppx/ocamlformat" :files ("emacs/*.el"))))
(package! dune :recipe (:fetcher github :repo "ocaml/dune" :files ("editor-integration/emacs/*.el")))
;; (defvar +ocaml-elisp-dir
;; (when (executable-find "opam")
;; (let ((opam-share (ignore-errors (car (process-lines "opam" "config" "var" "share" "--safe")))))
;; (when (and opam-share (file-directory-p opam-share))
;; (expand-file-name "emacs/site-lisp" opam-share)))))
;;
;; (defmacro localpackage! (name)
;; `(package! ,name :recipe (:fetcher file :path ,+ocaml-elisp-dir)))
;;
;; (localpackage! opam-site-lisp)
(package! dune :recipe
(:host github :repo "ocaml/dune" :files ("editor-integration/emacs/*.el")))

View File

@ -882,3 +882,12 @@ compelling reason, so..."
(org-clock-load))
:config
(add-hook 'kill-emacs-hook #'org-clock-save)))
;; HACK A necessary hack because org requires a compilation step after being
;; cloned, and during that compilation a org-version.el is generated with these
;; two functions, which return the output of a 'git describe ...' call in the
;; repo's root. Of course, this command won't work in a sparse clone, and more
;; than that, initiating these compilation step is a hassle, so...
(defun org-release () "")
(defun org-git-version () "")

View File

@ -1,15 +1,8 @@
;; -*- no-byte-compile: t; -*-
;;; lang/org/packages.el
;; Prevent built-in Org from playing into the byte-compilation of
;; `org-plus-contrib'.
(when-let (orglib (locate-library "org" nil doom-site-load-path))
(setq load-path (delete (substring (file-name-directory orglib) 0 -1)
load-path)))
(package! org-plus-contrib) ; install cutting-edge version of org-mode
(package! org :ignore t) ; ignore org on ELPA, if possible
(package! org-bullets :recipe (:fetcher github :repo "Kaligule/org-bullets"))
(package! org-plus-contrib) ; install cutting-edge version of org-mode
(package! org-bullets :recipe (:host github :repo "Kaligule/org-bullets"))
(package! toc-org)
(when (featurep! :editor evil)
(package! evil-org))
@ -17,7 +10,7 @@
(package! org-pdfview))
(package! htmlize)
(package! ox-clip)
(package! org-yt :recipe (:fetcher github :repo "TobiasZawada/org-yt"))
(package! org-yt :recipe (:host github :repo "TobiasZawada/org-yt"))
;;; Babel
(package! ob-async)
@ -28,7 +21,7 @@
(when (featurep! :lang nim)
(package! ob-nim))
(when (featurep! :lang racket)
(package! ob-racket :recipe (:fetcher github :repo "DEADB17/ob-racket")))
(package! ob-racket :recipe (:host github :repo "DEADB17/ob-racket")))
(when (featurep! :lang rest)
(package! ob-restclient))
(when (featurep! :lang rust)
@ -37,18 +30,14 @@
;;; Modules
(when (featurep! +dragndrop)
(package! org-download))
(when (featurep! +gnuplot)
(package! gnuplot)
(package! gnuplot-mode))
(when (featurep! +ipython)
(package! ob-ipython))
(when (featurep! +pandoc)
(package! ox-pandoc))
(when (featurep! +present)
(package! centered-window :recipe (:fetcher github :repo "anler/centered-window-mode"))
(package! centered-window :recipe (:host github :repo "anler/centered-window-mode"))
(package! org-tree-slide)
(package! ox-reveal))

View File

@ -2,13 +2,13 @@
;;; lang/php/packages.el
(package! php-boris)
(package! php-extras :recipe (:fetcher github :repo "arnested/php-extras"))
(package! php-extras :recipe (:host github :repo "arnested/php-extras"))
(package! php-mode)
(package! php-refactor-mode)
(package! phpunit)
(when (featurep! +hack)
(package! hack-mode :recipe (:fetcher github :repo "hhvm/hack-mode")))
(package! hack-mode :recipe (:host github :repo "hhvm/hack-mode")))
(unless (featurep! +lsp)
(package! phpactor))

View File

@ -1,7 +1,8 @@
;; -*- no-byte-compile: t; -*-
;;; lang/lua/packages.el
(package! terra-mode :recipe (:fetcher github :repo "StanfordLegion/terra-mode"))
(package! terra-mode
:recipe (:host github :repo "StanfordLegion/terra-mode"))
(when (featurep! :completion company)
(package! company-lua))

View File

@ -17,6 +17,11 @@ It is passed a user and repository name.")
(setq transient-levels-file (concat doom-etc-dir "transient/levels")
transient-values-file (concat doom-etc-dir "transient/values")
transient-history-file (concat doom-etc-dir "transient/history"))
;; HACK Magit complains loudly when it can't determine its own version, which
;; is the case when magit is built through straight. The warning is
;; harmless, however, so we just need it to shut up.
(advice-add #'magit-version :around #'ignore)
:config
(setq transient-default-level 5
magit-revision-show-gravatars '("^Author: " . "^Commit: ")

View File

@ -7,8 +7,8 @@
;; an older version of `auto-source-pass' is built into Emacs 26+, so we must
;; install the new version directly from the source and with a psuedonym.
(package! auth-source-pass-new
:recipe (auth-source-pass :fetcher github :repo "DamienCassou/auth-password-store"))
(package! auth-source-pass
:recipe (:host github :repo "DamienCassou/auth-password-store"))
(when (featurep! :completion ivy)
(package! ivy-pass))