diff options
| -rw-r--r-- | oni/home/config/rincewind.scm | 8 | ||||
| -rw-r--r-- | oni/packages/emacs-config.scm | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm index db1f7e0..21e4709 100644 --- a/oni/home/config/rincewind.scm +++ b/oni/home/config/rincewind.scm @@ -238,6 +238,8 @@ (fade-in-step 3) (fade-out-step 3)))) +(define my-emacs emacs-next-tree-sitter) + (home-environment (packages (list mpv mpv-mpris easytag (specification->package+output "glibc-locales") @@ -247,7 +249,7 @@ pick-random-wallpaper notmuch-collect-tasks notmuch-tag-mailinglists - (inbox-size emacs-next-tree-sitter) + (inbox-size my-emacs) count-emails shutdown-rofi emacs-org-roam @@ -263,7 +265,7 @@ emacs-outli emacs-guix - emacs-oni-org-roam + (emacs-oni-org-roam my-emacs) emacs-oni-vterm emacs-oni-elisp emacs-oni-core @@ -392,7 +394,7 @@ (service home-emacs-service-type (home-emacs-configuration - (package emacs-next-tree-sitter) + (package my-emacs) (configurations (list (local-file "../services/emacs/init.el") diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm index 9f304eb..07be069 100644 --- a/oni/packages/emacs-config.scm +++ b/oni/packages/emacs-config.scm @@ -13,7 +13,7 @@ #:use-module (oni packages go)) (define-public emacs-oni-config - (let ((commit "655ce45b2f4f8ebcc0e1937e1a362228022dd95d") + (let ((commit "e6a7b37ce47422db495d647b30643b9e26c58e67") (revision "0")) (package (name "emacs-oni-config") @@ -26,7 +26,7 @@ (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "00l4g6n3rk3fwnz6sfmfyagdqik5w21cm8mg3biz48qjnhhm1n5w")))) + (base32 "1qi64x699fg3nazzwch4y3ypdddppm7nsnvsjvr92ivv13p33sab")))) (build-system emacs-build-system) (home-page "https://code.ryuslash.org/ryuslash/emacs-config") (synopsis "My Emacs configuration") @@ -303,7 +303,7 @@ Emacs"))) (synopsis "My Emacs Bats coding configuration") (description "This package provides my configuration for coding in Bats"))) -(define-public emacs-oni-org +(define-public (emacs-oni-org emacs) (package (inherit emacs-oni-config) (name "emacs-oni-org") @@ -315,7 +315,10 @@ Emacs"))) #:include '("\\.el$" "^snippets\\/org-mode\\/" "^capture-templates\\/" - "^icons\\/"))) + "^icons\\/") + ;; The default #:emacs (emacs-minimal) doesn't include `range.el' and + ;; throws an error while trying to byte-compile oni-org. + #:emacs ,emacs)) (propagated-inputs `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet) ("emacs-oni-alert" ,emacs-oni-alert) @@ -334,14 +337,14 @@ Emacs"))) (synopsis "My Emacs Org configuration") (description "This package provides my configuration for org"))) -(define-public emacs-oni-org-roam +(define-public (emacs-oni-org-roam emacs) (package (inherit emacs-oni-config) (name "emacs-oni-org-roam") (arguments '(#:include '("oni-org-roam.el"))) (propagated-inputs - `(("emacs-oni-org" ,emacs-oni-org) + `(("emacs-oni-org" ,(emacs-oni-org emacs)) ("emacs-org-roam" ,emacs-org-roam))) (synopsis "My Emacs Org Roam configuration") (description "This package provides my configuration for Org Roam"))) |