ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to latest emacs config

Browse source
This commit is contained in:
Tom Willemse 2023-09-19 00:37:47 -07:00
parent 8341bb5d24
commit 0bf5c4ee89
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
oni/home/config/rincewind.scm
View file

@ -238,6 +238,8 @@
(fade-in-step 3) (fade-in-step 3)
(fade-out-step 3)))) (fade-out-step 3))))
(define my-emacs emacs-next-tree-sitter)
(home-environment (home-environment
(packages (list mpv mpv-mpris easytag (packages (list mpv mpv-mpris easytag
(specification->package+output "glibc-locales") (specification->package+output "glibc-locales")
@ -247,7 +249,7 @@
pick-random-wallpaper pick-random-wallpaper
notmuch-collect-tasks notmuch-collect-tasks
notmuch-tag-mailinglists notmuch-tag-mailinglists
(inbox-size emacs-next-tree-sitter) (inbox-size my-emacs)
count-emails count-emails
shutdown-rofi shutdown-rofi
emacs-org-roam emacs-org-roam
@ -263,7 +265,7 @@
emacs-outli emacs-outli
emacs-guix emacs-guix
emacs-oni-org-roam (emacs-oni-org-roam my-emacs)
emacs-oni-vterm emacs-oni-vterm
emacs-oni-elisp emacs-oni-elisp
emacs-oni-core emacs-oni-core
@ -392,7 +394,7 @@
(service home-emacs-service-type (service home-emacs-service-type
(home-emacs-configuration (home-emacs-configuration
(package emacs-next-tree-sitter) (package my-emacs)
(configurations (configurations
(list (list
(local-file "../services/emacs/init.el") (local-file "../services/emacs/init.el")

15
oni/packages/emacs-config.scm
View file

@ -13,7 +13,7 @@
#:use-module (oni packages go)) #:use-module (oni packages go))
(define-public emacs-oni-config (define-public emacs-oni-config
(let ((commit "655ce45b2f4f8ebcc0e1937e1a362228022dd95d") (let ((commit "e6a7b37ce47422db495d647b30643b9e26c58e67")
(revision "0")) (revision "0"))
(package (package
(name "emacs-oni-config") (name "emacs-oni-config")
@ -26,7 +26,7 @@
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "00l4g6n3rk3fwnz6sfmfyagdqik5w21cm8mg3biz48qjnhhm1n5w")))) (base32 "1qi64x699fg3nazzwch4y3ypdddppm7nsnvsjvr92ivv13p33sab"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://code.ryuslash.org/ryuslash/emacs-config") (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
(synopsis "My Emacs configuration") (synopsis "My Emacs configuration")
@ -303,7 +303,7 @@ Emacs")))
(synopsis "My Emacs Bats coding configuration") (synopsis "My Emacs Bats coding configuration")
(description "This package provides my configuration for coding in Bats"))) (description "This package provides my configuration for coding in Bats")))
(define-public emacs-oni-org (define-public (emacs-oni-org emacs)
(package (package
(inherit emacs-oni-config) (inherit emacs-oni-config)
(name "emacs-oni-org") (name "emacs-oni-org")
@ -315,7 +315,10 @@ Emacs")))
#:include '("\\.el$" #:include '("\\.el$"
"^snippets\\/org-mode\\/" "^snippets\\/org-mode\\/"
"^capture-templates\\/" "^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 (propagated-inputs
`(("emacs-oni-yasnippet" ,emacs-oni-yasnippet) `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
("emacs-oni-alert" ,emacs-oni-alert) ("emacs-oni-alert" ,emacs-oni-alert)
@ -334,14 +337,14 @@ Emacs")))
(synopsis "My Emacs Org configuration") (synopsis "My Emacs Org configuration")
(description "This package provides my configuration for org"))) (description "This package provides my configuration for org")))
(define-public emacs-oni-org-roam (define-public (emacs-oni-org-roam emacs)
(package (package
(inherit emacs-oni-config) (inherit emacs-oni-config)
(name "emacs-oni-org-roam") (name "emacs-oni-org-roam")
(arguments (arguments
'(#:include '("oni-org-roam.el"))) '(#:include '("oni-org-roam.el")))
(propagated-inputs (propagated-inputs
`(("emacs-oni-org" ,emacs-oni-org) `(("emacs-oni-org" ,(emacs-oni-org emacs))
("emacs-org-roam" ,emacs-org-roam))) ("emacs-org-roam" ,emacs-org-roam)))
(synopsis "My Emacs Org Roam configuration") (synopsis "My Emacs Org Roam configuration")
(description "This package provides my configuration for Org Roam"))) (description "This package provides my configuration for Org Roam")))