From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Fri, 2 Jun 2023 16:41:17 +0000 (+0200)
Subject: [emacs] Prefer emacs package manager to guix.
X-Git-Url: https://git.ekhem.eu.org/?a=commitdiff_plain;h=b0805ddfbf67df78b65a502188af1ca9e73de383;p=guix.git

[emacs] Prefer emacs package manager to guix.

Emacs package versions are more up to date.
---

diff --git a/conf/home/emacs.scm b/conf/home/emacs.scm
index 0fd3668..72e5302 100644
--- a/conf/home/emacs.scm
+++ b/conf/home/emacs.scm
@@ -28,16 +28,14 @@
 (define emacs-batch-edit-service
   (service home-program-service-type
 	   (home-program-configuration
-	    (packages
-	     (list emacs-wgrep))
+	    (packages '())
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-batch-edit.el")))))
 
 (define emacs-calfw-service
   (service home-program-service-type
 	   (home-program-configuration
-	    (packages
-	     (list emacs-calfw))
+	    (packages '())
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-calendar.el")))))
 
@@ -45,8 +43,7 @@
   (service home-program-service-type
 	   (home-program-configuration
 	    (packages
-	     (list emacs-consult
-		   ripgrep))
+	     (list ripgrep))
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-consult.el")))))
 
@@ -69,8 +66,7 @@
 	   (home-program-configuration
 	    ;; file
 	    (packages
-	     (list emacs-dired-hacks
-		   xdg-utils))
+	     (list xdg-utils))
 	    (dotfiles
 	     (list "mime/.config/mimeapps.list"
 		   "emacs/.config/emacs/conf/conf-dired.el")))))
@@ -80,8 +76,7 @@
 	   (home-program-configuration
 	    ;; libpng cairo autoconf automake gcc pkg-config
 	    (packages
-	     (list emacs-pdf-tools
-		   poppler))
+	     (list poppler))
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-document.el")))))
 
@@ -89,10 +84,8 @@
   (service home-program-service-type
 	   (home-program-configuration
 	    (packages
-	     (list emacs-notmuch
-		   isync
-		   msmtp
-		   notmuch))
+	     (list isync
+		   msmtp))
 	    (dotfiles
 	     (list "bash/.config/profile.d/50-notmuch.sh"
 		   "emacs/.config/emacs/conf/conf-email.el")))))
@@ -100,9 +93,7 @@
 (define emacs-keys-service
   (service home-program-service-type
 	   (home-program-configuration
-	    (packages
-	     (list emacs-transient
-		   emacs-which-key))
+	    (packages '())
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-keys.el")))))
 
@@ -118,9 +109,7 @@
 (define emacs-minibuffer-service
   (service home-program-service-type
 	   (home-program-configuration
-	    (packages
-	     (list emacs-orderless
-		   emacs-vertico))
+	    (packages '())
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-minibuffer.el")))))
 
@@ -129,8 +118,6 @@
 	   (home-program-configuration
 	    (packages
 	     (list alsa-utils
-		   emacs-alsamixer-el
-		   emacs-bongo
 		   mplayer))
 	    (dotfiles
 	     (list "bash/.config/profile.d/50-alsa.sh"
@@ -141,17 +128,14 @@
   (service home-program-service-type
 	   (home-program-configuration
 	    (packages
-	     (list emacs-org-roam
-		   sqlite))
+	     (list sqlite))
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-org.el")))))
 
 (define emacs-package-service
   (service home-program-service-type
 	   (home-program-configuration
-	    (packages
-	     (list emacs-exec-path-from-shell
-		   emacs-use-package))
+	    (packages '())
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-package.el")))))
 
@@ -159,8 +143,7 @@
   (service home-program-service-type
 	   (home-program-configuration
 	    (packages
-	     (list emacs-pass
-		   gnupg
+	     (list gnupg
 		   password-store))
 	    (dotfiles
 	     (list "bash/.config/profile.d/50-gpg.sh"
@@ -171,7 +154,7 @@
   (service home-program-service-type
 	   (home-program-configuration
 	    (packages
-	     (list curl emacs-elfeed))
+	     (list curl))
 	    (dotfiles
 	     (list "emacs/.config/emacs/conf/conf-rss.el")))))
 
@@ -193,7 +176,7 @@
   (service home-program-service-type
 	   (home-program-configuration
 	    (packages
-	     (list emacs-magit git))
+	     (list git))
 	    (dotfiles
 	     (list "git/.config/git/config"
 		   "emacs/.config/emacs/conf/conf-vc.el")))))