From 4d1ed8959cab1cb556885c9f85791f0c26f88fca Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 5 Dec 2019 11:31:43 +0100 Subject: [PATCH] Guix: Move Emacs to dedicated profile. --- .gnupg/gpg-agent.conf | 2 +- .package-lists/guix-default-manifest.scm | 107 +---------------------- .package-lists/guix-emacs-manifest.scm | 107 +++++++++++++++++++++++ .package-lists/guix-main-manifest.scm | 1 - 4 files changed, 109 insertions(+), 108 deletions(-) create mode 100644 .package-lists/guix-emacs-manifest.scm diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index 5988162c..09aa1d0f 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -7,6 +7,6 @@ default-cache-ttl-ssh 86400 max-cache-ttl-ssh 86400 ## Emacs pinentry # pinentry-program /usr/bin/pinentry-emacs -pinentry-program /home/ambrevar/.guix-profile/bin/pinentry-emacs +pinentry-program /home/ambrevar/.guix-extra-profiles/emacs/emacs/bin/pinentry-emacs allow-emacs-pinentry allow-loopback-pinentry \ No newline at end of file diff --git a/.package-lists/guix-default-manifest.scm b/.package-lists/guix-default-manifest.scm index b60f9bd4..5385bf33 100644 --- a/.package-lists/guix-default-manifest.scm +++ b/.package-lists/guix-default-manifest.scm @@ -3,109 +3,4 @@ "aspell-dict-de" ; TODO: Keep dicts in default profile until bug #29686 is fixed. "aspell-dict-en" "aspell-dict-fr" - "clhs" - "emacs" - "emacs-auctex" - "emacs-bash-completion" - "emacs-blimp" - "emacs-circe" - "emacs-cmake-mode" - "emacs-company" - ;; "emacs-dedicated" ; Doesn't work so well, or did I misunderstand? - "emacs-daemons" - "emacs-debbugs" - "emacs-desktop-environment" - "emacs-disk-usage" - ;; "emacs-dtrt-indent" - "emacs-elfeed" - "emacs-emms" - "emacs-engine-mode" - "emacs-esh-autosuggest" - "emacs-eshell-prompt-extras" - "emacs-eshell-did-you-mean" - "emacs-esup" - "emacs-evil" - "emacs-evil-collection" - "emacs-evil-commentary" - "emacs-evil-magit" - "emacs-evil-multiedit" - "emacs-evil-org" - "emacs-expand-region" - "emacs-exwm" - "emacs-exwm-edit" - "emacs-fish-completion" - "emacs-flycheck" - "emacs-forge" - "emacs-geiser" - "emacs-gif-screencast" - "emacs-google-translate" - "emacs-gtk-look" - "emacs-guix" - "emacs-hackernews" - "emacs-helm" - "emacs-helm-company" - "emacs-helm-descbinds" - "emacs-helm-emms" - "emacs-helm-eww" - "emacs-helm-exwm" - "emacs-helm-fish-completion" - "emacs-helm-flycheck" - "emacs-helm-ls-git" - "emacs-helm-notmuch" - "emacs-helm-org" - "emacs-helm-org-contacts" - "emacs-helm-pass" - "emacs-helm-sly" - "emacs-helm-system-packages" - "emacs-helpful" - "emacs-hl-todo" - "emacs-iedit" - "emacs-image+" - "emacs-ledger-mode" - "emacs-lispy" - "emacs-lispyville" - "emacs-lua-mode" - "emacs-macrostep" - "emacs-magit" - "emacs-magit-todos" - "emacs-markdown-mode" - "emacs-md4rd" - "emacs-mu4e-conversation" - "emacs-nix-mode" - "emacs-org" - "emacs-org-bullets" - "emacs-org-contrib" - "emacs-org-reveal" - "emacs-orgit" - "emacs-package-lint" - "emacs-pdf-tools" - "emacs-pinentry" - "emacs-pulseaudio-control" - "emacs-racket-mode" - "emacs-rainbow-delimiters" - "emacs-rainbow-mode" - "emacs-redshank" - "emacs-restclient" - "emacs-sly" - "emacs-sly-asdf" - "emacs-sly-quicklisp" - "emacs-sly-macrostep" - "emacs-sly-named-readtables" - ;; "emacs-sly-package-inferred" ; TODO: This package triggers an infinite recursion. - "emacs-so-long" - "emacs-strace-mode" - "emacs-suggest" - "emacs-sx" - "emacs-synosaurus" - "emacs-transmission" - "emacs-undo-tree" - "emacs-unfill" - "emacs-w3m" - "emacs-wgrep" - "emacs-windower" - "emacs-ws-butler" - "emacs-yasnippet" - "emacs-youtube-dl" - "emacs-ztree" - "font-dejavu" - "pinentry-emacs")) + "font-dejavu")) diff --git a/.package-lists/guix-emacs-manifest.scm b/.package-lists/guix-emacs-manifest.scm new file mode 100644 index 00000000..27e60dac --- /dev/null +++ b/.package-lists/guix-emacs-manifest.scm @@ -0,0 +1,107 @@ +(specifications->manifest + '("clhs" + "emacs" + "emacs-auctex" + "emacs-bash-completion" + "emacs-blimp" + "emacs-circe" + "emacs-cmake-mode" + "emacs-company" + ;; "emacs-dedicated" ; Doesn't work so well, or did I misunderstand? + "emacs-daemons" + "emacs-debbugs" + "emacs-desktop-environment" + "emacs-disk-usage" + ;; "emacs-dtrt-indent" + "emacs-elfeed" + "emacs-emms" + "emacs-engine-mode" + "emacs-esh-autosuggest" + "emacs-eshell-prompt-extras" + "emacs-eshell-did-you-mean" + "emacs-esup" + "emacs-evil" + "emacs-evil-collection" + "emacs-evil-commentary" + "emacs-evil-magit" + "emacs-evil-multiedit" + "emacs-evil-org" + "emacs-expand-region" + "emacs-exwm" + "emacs-exwm-edit" + "emacs-fish-completion" + "emacs-flycheck" + "emacs-forge" + "emacs-geiser" + "emacs-gif-screencast" + "emacs-google-translate" + "emacs-gtk-look" + "emacs-guix" + "emacs-hackernews" + "emacs-helm" + "emacs-helm-company" + "emacs-helm-descbinds" + "emacs-helm-emms" + "emacs-helm-eww" + "emacs-helm-exwm" + "emacs-helm-fish-completion" + "emacs-helm-flycheck" + "emacs-helm-ls-git" + "emacs-helm-notmuch" + "emacs-helm-org" + "emacs-helm-org-contacts" + "emacs-helm-pass" + "emacs-helm-sly" + "emacs-helm-system-packages" + "emacs-helpful" + "emacs-hl-todo" + "emacs-iedit" + "emacs-image+" + "emacs-ledger-mode" + "emacs-lispy" + "emacs-lispyville" + "emacs-lua-mode" + "emacs-macrostep" + "emacs-magit" + "emacs-magit-todos" + "emacs-markdown-mode" + "emacs-md4rd" + "emacs-mu4e-conversation" + "emacs-nix-mode" + "emacs-org" + "emacs-org-bullets" + "emacs-org-contrib" + "emacs-org-reveal" + "emacs-orgit" + "emacs-package-lint" + "emacs-pdf-tools" + "emacs-pinentry" + "emacs-pulseaudio-control" + "emacs-racket-mode" + "emacs-rainbow-delimiters" + "emacs-rainbow-mode" + "emacs-redshank" + "emacs-restclient" + "emacs-sly" + "emacs-sly-asdf" + "emacs-sly-quicklisp" + "emacs-sly-macrostep" + ;; "emacs-sly-named-readtables" + ;; "emacs-sly-package-inferred" ; TODO: This package triggers an infinite recursion. + "emacs-so-long" + "emacs-strace-mode" + "emacs-suggest" + "emacs-sx" + "emacs-synosaurus" + "emacs-transmission" + "emacs-undo-tree" + "emacs-unfill" + "emacs-w3m" + "emacs-wgrep" + "emacs-windower" + "emacs-ws-butler" + "emacs-yasnippet" + "emacs-youtube-dl" + "emacs-ztree" + "notmuch" + "pinentry-emacs")) diff --git a/.package-lists/guix-main-manifest.scm b/.package-lists/guix-main-manifest.scm index f7ebf7ac..61a73c05 100644 --- a/.package-lists/guix-main-manifest.scm +++ b/.package-lists/guix-main-manifest.scm @@ -84,7 +84,6 @@ "nethogs" "next" "nmap" - "notmuch" "numlockx" "odt2txt" "openssh"