diff options
author | Tom Willemse | 2024-01-30 13:24:02 -0800 |
---|---|---|
committer | Tom Willemse | 2024-01-30 13:24:02 -0800 |
commit | 0aa0b2396219aaa5b1ac3f31d8260cbc2606f61a (patch) | |
tree | 248faafcbaaf14704ff4fe9a353833489e4d4365 /oni/packages | |
parent | 5755831bb64b1f6152057b3b5055e9dddc7ecc70 (diff) | |
download | new-dotfiles-0aa0b2396219aaa5b1ac3f31d8260cbc2606f61a.tar.gz new-dotfiles-0aa0b2396219aaa5b1ac3f31d8260cbc2606f61a.zip |
Add custom ‘emacs-company’ package, remove custom ‘emacs-notmuch’
The custom ‘emacs-notmuch’ package isn't necessary anymore since my patch was
submitted[1]
The custom ‘emacs-company’ fixes some issues with icons and images not loading
while installed with Guix.
[1]: https://issues.guix.gnu.org/68667
Diffstat (limited to 'oni/packages')
-rw-r--r-- | oni/packages/emacs.scm | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm index 5fe317b..b3f8d2f 100644 --- a/oni/packages/emacs.scm +++ b/oni/packages/emacs.scm @@ -417,33 +417,38 @@ new-theme for a while. I couldn't think of a name so I named it after him.") (description "A simple capf (Completion-At-Point Function) for completing yasnippet snippets.") (license license:gpl3)))) -(define-public oni-emacs-notmuch +(define-public oni-emacs-company (package - (inherit notmuch) - (name "oni-emacs-notmuch") + (name "oni-emacs-company") + (version "0.10.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "company-" version ".tar")) + (sha256 + (base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9")))) (build-system emacs-build-system) - (native-inputs '()) - (inputs - (list notmuch)) (arguments (list - #:exclude #~(cons* "make-deps.el" "rstdoc.el" %default-exclude) - #:include #~(cons* "notmuch-logo.svg" %default-include) + #:include #~(cons* "icons/" %default-include) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "emacs"))) - (add-after 'chdir 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((notmuch (search-input-file inputs "/bin/notmuch"))) - (substitute* "notmuch-lib.el" - (("\"notmuch\"") - (string-append "\"" notmuch "\""))))))))) - (synopsis "Run Notmuch within Emacs") + (add-after 'move-doc 'install-doc-images + (lambda* (#:key outputs #:allow-other-keys) + (let ((images (find-files "./images/small/" ".*\\.png$"))) + (for-each (lambda (image) + (install-file image + (string-append #$output "/share/info/images/small"))) + images))))))) + (home-page "https://company-mode.github.io/") + (synopsis "Modular text completion framework") (description - "This package provides an Emacs-based interface to the Notmuch mail -system."))) + "Company is a modular completion mechanism. Modules for retrieving +completion candidates are called back-ends, modules for displaying them are +front-ends. Company comes with many back-ends, e.g., @code{company-elisp}. +These are distributed in separate files and can be used individually.") + (license license:gpl3+))) (define-public emacs-golden-ratio (let ((commit "375c9f287dfad68829582c1e0a67d0c18119dab9") |