examples: emacs: Add fontconfig into the manifest.

To provide XDG_DATA_DIRS search path.

* modules/rosenthal/examples/emacs/manifest.tmpl: Add fontconfig.

modules/rosenthal/examples/emacs/init-editing.el

@@ -11,22 +11,17 @@
   (setopt electric-indent-inhibit t)
   :hook
   (before-save . delete-trailing-whitespace)
-  ;; Use Ctrl-C/X/Z for copy, cut, paste.
-  (after-init . cua-mode)
   ;; Automatic parenthesis pairing.
   (after-init . electric-pair-mode))
 
 ;; Check syntax on the fly.
-;;guix:emacs-flycheck
 (use-package flycheck
   :hook
   (after-init . global-flycheck-mode))
 
-;;guix:emacs-flycheck-guile
 (use-package flycheck-guile
   :after (flycheck geiser-guile))
 
-;;guix:emacs-geiser
 (use-package geiser
   :custom
   (geiser-autodoc-identifier-format "%s → %s")
@@ -55,7 +50,6 @@
                  (mouse-set-point event)
                  (popup-menu (context-menu)))))
 
-;;guix:emacs-geiser-guile
 (use-package geiser-guile
   :after (geiser)
   :custom
@@ -76,12 +70,10 @@
               "/run/current-system/profile/share/guile/site/3.0")))
     (add-to-list 'geiser-guile-load-path path t)))
 
-;;guix:emacs-macrostep
 (use-package macrostep
   :bind
   ("C-c e" . macrostep-expand))
 
-;;guix:emacs-macrostep-geiser
 (use-package macrostep-geiser
   :after (geiser-mode)
   :hook
@@ -92,7 +84,6 @@
   :hook
   (geiser-repl-mode . macrostep-geiser-setup))
 
-;;guix:emacs-puni
 (use-package puni
   :hook
   ((eval-expression-minibuffer-setup nxml-mode prog-mode sgml-mode tex-mode)

modules/rosenthal/examples/emacs/init-fonts.el

@@ -2,10 +2,6 @@
 
 ;; https://github.com/nykma/nema/blob/develop/my-sample/font.el
 
-;;guix:font-adobe-source-serif
-;;guix:font-google-noto-emoji
-;;guix:font-sarasa-gothic
-;;guix:font-victor-mono
 (defvar nema--font-size 12 "Font size")
 (defvar nema-fonts '((sans     . "sans")
                      (serif    . "serif")

modules/rosenthal/examples/emacs/init-interface.el

@@ -30,27 +30,21 @@
   :custom
   (fringe-mode 0)
   (modus-themes-italic-constructs t)
-  (scroll-bar-mode nil)
-  (tool-bar-mode nil)
-  (tooltip-mode nil)
   :config
-  (load-theme 'modus-operandi-tinted :no-confirm)
+  (load-theme 'modus-operandi-tinted :no-confirm))
-  :hook
-  (after-init . menu-bar-mode))
 
-;;guix:emacs-corfu
 (use-package corfu
   :custom
   ;; Auto-completion.
   (corfu-auto t)
   (corfu-auto-delay 0.3)
-  :config
-  ;; Free the `RET' key for less intrusive behavior.
-  (keymap-unset corfu-map "RET")
   :hook
-  (after-init . global-corfu-mode))
+  (after-init . global-corfu-mode)
+  :bind
+  ;; Free the `RET' key for less intrusive behavior.
+  (:map corfu-map
+        ("RET" . nil)))
 
-;;guix:emacs-doom-modeline
 (use-package doom-modeline
   :custom
   (doom-modeline-icon nil)
@@ -58,7 +52,6 @@
   :hook
   (after-init . doom-modeline-mode))
 
-;;guix:emacs-helpful
 (use-package helpful
   :bind
   ([remap describe-function] . helpful-callable)
@@ -68,7 +61,6 @@
   ([remap describe-symbol]   . helpful-symbol)
   ("C-c C-d" . helpful-at-point))
 
-;;guix:emacs-hl-todo
 (use-package hl-todo
   :custom
   (hl-todo-highlight-punctuation ":")
@@ -82,13 +74,11 @@
   (regexp-search-ring-max 200)
   (search-ring-max 200))
 
-;;guix:emacs-mwim
 (use-package mwim
   :bind
   ([remap move-beginning-of-line] . mwim-beginning)
   ([remap move-end-of-line] . mwim-end))
 
-;;guix:emacs-orderless
 (use-package orderless
   :custom
   (completion-styles '(orderless basic))
@@ -101,12 +91,10 @@
   :hook
   (after-init . show-paren-mode))
 
-;;guix:emacs-rainbow-delimiters
 (use-package rainbow-delimiters
   :hook
   (prog-mode . rainbow-delimiters-mode))
 
-;;guix:emacs-vertico
 (use-package vertico
   :hook
   (after-init . vertico-mode))

modules/rosenthal/examples/emacs/init-miscellaneous.el

@@ -1,10 +1,5 @@
 ;;; -*- lexical-binding: t -*-
 
-;;guix:emacs-daemons
-(use-package daemons
-  :custom
-  (daemons-list-fill-frame t))
-
 (use-package dired
   :custom
   (dired-listing-switches
@@ -18,12 +13,10 @@
   (dired-create-destination-dirs-on-trailing-dirsep t)
   (dired-vc-rename-file t))
 
-;;guix:emacs-envrc
 (use-package envrc
   :hook
   (after-init . envrc-global-mode))
 
-;;guix:emacs-magit
 (use-package magit
   :custom
   (git-commit-cd-to-toplevel t))
@@ -35,6 +28,5 @@
   (:map project-prefix-map
         ("m" . magit-project-status)))
 
-;;guix:emacs-forge
 (use-package forge
   :after (magit))

modules/rosenthal/examples/emacs/init.el

@@ -6,13 +6,11 @@
   (load custom-file))
 
 ;; Tweak garbage collection strategy.
-;;guix:emacs-gcmh
 (use-package gcmh
   :config
   (gcmh-mode 1))
 
 ;; Set default storage locations for various packages.
-;;guix:emacs-no-littering
 (use-package no-littering
   :config
   (no-littering-theme-backups))
@@ -34,7 +32,11 @@
 
 (progn
   (setopt initial-scratch-message
-          ";;; Type your Guile program here and evaluate it.\n\n")
+          "\
+;;; Type your Guile program here and evaluate it.
+;;; `M-x cua-mode' to use Ctrl-C/X/Z for copy, cut, paste.
+;;; `M-x evil-mode' for Vim-like experience.
+\n")
   (scheme-mode)
   (geiser-repl-import-module "(gnu)")
   (geiser-repl-import-module "(nonguix)")

modules/rosenthal/examples/emacs/install.sh

@@ -1,7 +1,4 @@
 #!/bin/sh
-
+dir="$(dirname "$(realpath "$0")")"
-grep --recursive --no-filename '^;;guix:' . |
+[[ ! -e ~/.config/emacs/init.el ]] && cp --recursive "$dir/." ~/.config/emacs
-    sed --regexp-extended 's/^;;guix:(.*)/"\1"/g' |
+guix package --install --manifest="$dir/manifest.tmpl"
-    xargs guix install emacs-pgtk
-
-[[ ! -e ~/.config/emacs/init.el ]] && cp --recursive . ~/.config/emacs

modules/rosenthal/examples/emacs/manifest.tmpl

@@ -0,0 +1,38 @@
+;;; -*- mode: scheme -*-
+
+(use-modules (gnu packages))
+
+(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-nftables-mode"
+   "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"
+   ))

modules/rosenthal/examples/guix/config.tmpl

@@ -45,9 +45,11 @@
                  "neovim"
 
                  "emacs-corfu"
-                 "emacs-daemons"
                  "emacs-doom-modeline"
+                 "emacs-edit-indirect"                ;for emacs-markdown-mode.
                  "emacs-envrc"
+                 "emacs-evil"
+                 "emacs-fish-mode"
                  "emacs-flycheck"
                  "emacs-flycheck-guile"
                  "emacs-forge"
@@ -56,10 +58,13 @@
                  "emacs-geiser-guile"
                  "emacs-helpful"
                  "emacs-hl-todo"
+                 "emacs-json-mode"
                  "emacs-macrostep"
                  "emacs-macrostep-geiser"
                  "emacs-magit"
+                 "emacs-markdown-mode"
                  "emacs-mwim"
+                 "emacs-nftables-mode"
                  "emacs-no-littering"
                  "emacs-orderless"
                  "emacs-puni"