summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgenii Lepikhin <johnlepikhin@gmail.com>2023-05-22 08:18:44 +0300
committerEvgenii Lepikhin <johnlepikhin@gmail.com>2023-05-22 08:18:44 +0300
commit180384307a1c89da76b6192931c4d2f7adb200ca (patch)
treec7ac595e6234ad7f3a4a94e99dee662d7c12433a
parentfix: Remove generated local.el (diff)
downloadjohnlepikhin-guix-channel-180384307a1c89da76b6192931c4d2f7adb200ca.tar.gz
fix: Single home activation service
-rw-r--r--johnlepikhin/home/emacs.scm30
1 files changed, 14 insertions, 16 deletions
diff --git a/johnlepikhin/home/emacs.scm b/johnlepikhin/home/emacs.scm
index 0c2d307..18a68c8 100644
--- a/johnlepikhin/home/emacs.scm
+++ b/johnlepikhin/home/emacs.scm
@@ -46,9 +46,14 @@
(define (add-emacs-package config)
(list (home-emacs-configuration-package config) git))
-(define (git-clone-configs config)
+(define (activate-service config)
(gexp
(begin
+ ;; Remove compiled by Emacs local.el
+ (let ((local.el (string-append (getenv "HOME") "/.emacs.d/local.el")))
+ (when (file-exists? local.el)
+ (delete-file local.el)))
+ ;; Clone main config repository
(let ((clone-path (string-append (getenv "HOME") "/.emacs.d/public")))
(mkdir-p clone-path)
(when (not (file-exists? clone-path))
@@ -58,10 +63,6 @@
(ungexp (home-emacs-configuration-configs-git-repo config))
clone-path))))))
-(define (remove-generated-local.el config)
- (gexp
- (remove-file (string-append (getenv "HOME") "/.emacs.d/local.el"))))
-
(define (add-xsession-component config)
"emacs --daemon &")
@@ -70,16 +71,13 @@
(name 'home-emacs)
(extensions
(list
- (service-extension
- home-files-service-type add-emacs-config)
- (service-extension
- home-profile-service-type add-emacs-package)
- (service-extension
- home-activation-service-type git-clone-configs)
- (service-extension
- home-activation-service-type remove-generated-local.el)
- (service-extension
- home-xsession-service-type
- add-xsession-component)))
+ (service-extension home-files-service-type
+ add-emacs-config)
+ (service-extension home-profile-service-type
+ add-emacs-package)
+ (service-extension home-activation-service-type
+ activate-service)
+ (service-extension home-xsession-service-type
+ add-xsession-component)))
(compose concatenate)
(description "Install emacs and add configs")))