aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2025-07-18 18:07:27 -0700
committerGravatar Tom Willemse2025-07-18 18:07:27 -0700
commit5d87feff0d487e669ee049eda1a43f445fbb7870 (patch)
treeaf624adaa66865e0ec35f54a05422dfdeeee76a6
parentfc71258065759111280a60c1870f496edefb7921 (diff)
downloadnew-dotfiles-5d87feff0d487e669ee049eda1a43f445fbb7870.tar.gz
new-dotfiles-5d87feff0d487e669ee049eda1a43f445fbb7870.zip
data: Fix configuration
-rw-r--r--oni/home/config/data.scm26
1 files changed, 14 insertions, 12 deletions
diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm
index 804e461..39598ef 100644
--- a/oni/home/config/data.scm
+++ b/oni/home/config/data.scm
@@ -4,7 +4,7 @@
#:use-module (gnu home)
#:use-module (gnu packages admin)
#:use-module ((gnu packages emacs)
- #:select (emacs-pgtk))
+ #:select (emacs))
#:use-module ((gnu packages emacs-xyz)
#:select (emacs-guix
emacs-org-contacts))
@@ -26,15 +26,15 @@
#:use-module ((oni home services emacs)
#:select (home-emacs-service-type
home-emacs-configuration
- home-emacs-helpful-service-type
home-emacs-helpful-configuration
- home-emacs-yasnippet-capf-service-type
+ home-emacs-yasnippet-capf-configuration
home-emacs-eros-service-type
home-emacs-ace-link-service-type
home-emacs-ace-link-configuration
home-emacs-golden-ratio-service-type
home-emacs-pinentry-service-type
- home-emacs-org-caldav-service-type))
+ home-emacs-org-caldav-service-type
+ home-emacs-envrc-configuration))
#:use-module (oni home services environment)
;; #:use-module (oni home services herbstluftwm)
#:use-module (oni home services kdeconnect)
@@ -128,7 +128,7 @@
emacs-outli
emacs-guix
- (emacs-oni-org-roam emacs-pgtk)
+ (emacs-oni-org-roam emacs)
emacs-oni-vterm
emacs-oni-elisp
emacs-oni-core
@@ -288,7 +288,15 @@
(service home-emacs-service-type
(home-emacs-configuration
- (package emacs-pgtk)
+ (helpful-configuration
+ (home-emacs-helpful-configuration
+ (configurations
+ (list
+ (local-file "../services/emacs/oni-helpful.el")))))
+ (yasnippet-capf
+ (home-emacs-yasnippet-capf-configuration))
+ (envrc
+ (home-emacs-envrc-configuration))
(configurations
(list
(local-file "../services/emacs/init.el")
@@ -300,12 +308,6 @@
"(load custom-file)\n"
"(provide 'init)\n"
";;; init.el ends here\n")))))
- (service home-emacs-helpful-service-type
- (home-emacs-helpful-configuration
- (configurations
- (list
- (local-file "../services/emacs/oni-helpful.el")))))
- (service home-emacs-yasnippet-capf-service-type)
(service home-emacs-eros-service-type)
(service home-emacs-ace-link-service-type
(home-emacs-ace-link-configuration