Move emacs packages to system-level packages

2 files changed, 41 insertions, 42 deletions

diff --git a/.config/guix/emacs-manifest.scm b/.config/guix/emacs-manifest.scm
deleted file mode 100644
index 73f46cf..0000000
--- a/.config/guix/emacs-manifest.scm
+++ /dev/null
@@ -1,29 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Below defines the emacs packages required for ;;
-;; associated init.el                            ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(specifications->manifest
- '(
-   "emacs-all-the-icons"
-   "emacs-all-the-icons-dired"
-   "emacs-auctex"
-   "emacs-consult"
-   "emacs-ef-themes"
-   "emacs-emms"
-   "emacs-guix"
-   "emacs-htmlize"
-   "emacs-magit"
-   "emacs-marginalia"
-   "emacs-notmuch"
-   "emacs-orderless"
-   "emacs-org-roam"
-   "emacs-paredit"
-   "emacs-popper"
-   "emacs-rainbow-delimiters"
-   "emacs-rainbow-mode"
-   "emacs-simple-httpd"
-   "emacs-slime"
-   "emacs-transmission"
-   "emacs-vertico"
-   "emacs-visual-fill-column"))
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 1b1c8df..e0fbdb3 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -18,6 +18,22 @@
             bd-base-system-services))
 
 
+
+(define comm
+  '(
+    "aspell"
+    "aspell-dict-en"
+    "gnupg"
+    "notmuch"
+    "offlineimap3"
+    "pass-otp"
+    "password-store"
+    "pinentry"
+    "transmission"
+    "xpdf" ; pdftotext
+    "yt-dlp"
+    ))
+
 (define dev
   '(
     "cryptsetup"
@@ -34,26 +50,38 @@
     "vim"
     ))
 
-(define comm
+(define emacs
   '(
-    "aspell"
-    "aspell-dict-en"
-    "gnupg"
-    "notmuch"
-    "offlineimap3"
-    "pass-otp"
-    "password-store"
-    "pinentry"
-    "transmission"
-    "xpdf" ; pdftotext
-    "yt-dlp"
+    "emacs-all-the-icons"
+    "emacs-all-the-icons-dired"
+    "emacs-auctex"
+    "emacs-consult"
+    "emacs-ef-themes"
+    "emacs-emms"
+    "emacs-guix"
+    "emacs-htmlize"
+    "emacs-magit"
+    "emacs-marginalia"
+    "emacs-notmuch"
+    "emacs-orderless"
+    "emacs-org-roam"
+    "emacs-paredit"
+    "emacs-popper"
+    "emacs-rainbow-delimiters"
+    "emacs-rainbow-mode"
+    "emacs-simple-httpd"
+    "emacs-slime"
+    "emacs-transmission"
+    "emacs-vertico"
+    "emacs-visual-fill-column"
     ))
 
 (define bd-base-system-packages
   `(,@(map specification->package
            (append!
-            dev
             comm
+            dev
+            emacs
             ))
     ,@%base-packages))