From 87828529f6b0dc07cddfe27817274c88939b7d91 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Thu, 19 Feb 2026 12:46:18 +0800
Subject: [PATCH] examples: emacs: Fix installation.

---
 modules/rosenthal/examples/emacs/install.sh   |  8 ++-
 .../rosenthal/examples/emacs/manifest.tmpl    | 69 +++++++++----------
 modules/rosenthal/examples/emacs/packages.txt | 31 +++++++++
 3 files changed, 71 insertions(+), 37 deletions(-)
 create mode 100644 modules/rosenthal/examples/emacs/packages.txt

diff --git a/modules/rosenthal/examples/emacs/install.sh b/modules/rosenthal/examples/emacs/install.sh
index f9d95df..a608e38 100755
--- a/modules/rosenthal/examples/emacs/install.sh
+++ b/modules/rosenthal/examples/emacs/install.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
 dir="$(dirname "$(realpath "$0")")"
-[[ ! -e ~/.config/emacs/init.el ]] && cp --recursive "$dir/." ~/.config/emacs
-guix package --install --manifest="$dir/manifest.tmpl"
+if [[ ! -f ~/.config/emacs/init.el ]]
+then
+    mkdir -p ~/.config/emacs
+    cp "$dir/init"* ~/.config/emacs
+fi
+cat "$dir/packages.txt" | xargs guix package --install
diff --git a/modules/rosenthal/examples/emacs/manifest.tmpl b/modules/rosenthal/examples/emacs/manifest.tmpl
index 9bc48ef..93320e4 100644
--- a/modules/rosenthal/examples/emacs/manifest.tmpl
+++ b/modules/rosenthal/examples/emacs/manifest.tmpl
@@ -1,37 +1,36 @@
-;;; -*- mode: scheme -*-
-
-(use-modules (gnu packages))
+;; What follows is a "manifest" equivalent to the command line you gave.
+;; You can store it in a file that you may then pass to any 'guix' command
+;; that accepts a '--manifest' (or '-m') option.
 
 (specifications->manifest
- '("emacs-pgtk"
-   "emacs-corfu"
-   "emacs-doom-modeline"
-   "emacs-edit-indirect"                ;for emacs-markdown-mode.
-   "emacs-envrc"
-   "emacs-evil"
-   "emacs-fish-mode"
-   "emacs-flycheck"
-   "emacs-flycheck-guile"
-   "emacs-forge"
-   "emacs-gcmh"
-   "emacs-geiser"
-   "emacs-geiser-guile"
-   "emacs-helpful"
-   "emacs-hl-todo"
-   "emacs-json-mode"
-   "emacs-macrostep"
-   "emacs-macrostep-geiser"
-   "emacs-magit"
-   "emacs-markdown-mode"
-   "emacs-mwim"
-   "emacs-no-littering"
-   "emacs-orderless"
-   "emacs-puni"
-   "emacs-rainbow-delimiters"
-   "emacs-vertico"
-   "fontconfig"
-   "font-adobe-source-serif"
-   "font-google-noto-emoji"
-   "font-sarasa-gothic"
-   "font-victor-mono"
-   ))
+  (list "emacs-pgtk"
+        "emacs-corfu"
+        "emacs-doom-modeline"
+        "emacs-edit-indirect"
+        "emacs-envrc"
+        "emacs-evil"
+        "emacs-fish-mode"
+        "emacs-flycheck"
+        "emacs-flycheck-guile"
+        "emacs-forge"
+        "emacs-gcmh"
+        "emacs-geiser"
+        "emacs-geiser-guile"
+        "emacs-helpful"
+        "emacs-hl-todo"
+        "emacs-json-mode"
+        "emacs-macrostep"
+        "emacs-macrostep-geiser"
+        "emacs-magit"
+        "emacs-markdown-mode"
+        "emacs-mwim"
+        "emacs-no-littering"
+        "emacs-orderless"
+        "emacs-puni"
+        "emacs-rainbow-delimiters"
+        "emacs-vertico"
+        "fontconfig"
+        "font-adobe-source-serif"
+        "font-google-noto-emoji"
+        "font-sarasa-gothic"
+        "font-victor-mono"))
diff --git a/modules/rosenthal/examples/emacs/packages.txt b/modules/rosenthal/examples/emacs/packages.txt
new file mode 100644
index 0000000..9464359
--- /dev/null
+++ b/modules/rosenthal/examples/emacs/packages.txt
@@ -0,0 +1,31 @@
+emacs-pgtk
+emacs-corfu
+emacs-doom-modeline
+emacs-edit-indirect
+emacs-envrc
+emacs-evil
+emacs-fish-mode
+emacs-flycheck
+emacs-flycheck-guile
+emacs-forge
+emacs-gcmh
+emacs-geiser
+emacs-geiser-guile
+emacs-helpful
+emacs-hl-todo
+emacs-json-mode
+emacs-macrostep
+emacs-macrostep-geiser
+emacs-magit
+emacs-markdown-mode
+emacs-mwim
+emacs-no-littering
+emacs-orderless
+emacs-puni
+emacs-rainbow-delimiters
+emacs-vertico
+fontconfig
+font-adobe-source-serif
+font-google-noto-emoji
+font-sarasa-gothic
+font-victor-mono