diff --git a/modules/rosenthal/examples/emacs/init-editing.el b/modules/rosenthal/examples/emacs/init-editing.el index 44a691b..5cf0893 100644 --- a/modules/rosenthal/examples/emacs/init-editing.el +++ b/modules/rosenthal/examples/emacs/init-editing.el @@ -17,16 +17,13 @@ (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 +52,6 @@ (mouse-set-point event) (popup-menu (context-menu))))) -;;guix:emacs-geiser-guile (use-package geiser-guile :after (geiser) :custom @@ -76,12 +72,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 +86,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) diff --git a/modules/rosenthal/examples/emacs/init-fonts.el b/modules/rosenthal/examples/emacs/init-fonts.el index 87c0bd8..952e061 100644 --- a/modules/rosenthal/examples/emacs/init-fonts.el +++ b/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") diff --git a/modules/rosenthal/examples/emacs/init-interface.el b/modules/rosenthal/examples/emacs/init-interface.el index 354e3a8..eb05e77 100644 --- a/modules/rosenthal/examples/emacs/init-interface.el +++ b/modules/rosenthal/examples/emacs/init-interface.el @@ -38,7 +38,6 @@ :hook (after-init . menu-bar-mode)) -;;guix:emacs-corfu (use-package corfu :custom ;; Auto-completion. @@ -50,7 +49,6 @@ :hook (after-init . global-corfu-mode)) -;;guix:emacs-doom-modeline (use-package doom-modeline :custom (doom-modeline-icon nil) @@ -58,7 +56,6 @@ :hook (after-init . doom-modeline-mode)) -;;guix:emacs-helpful (use-package helpful :bind ([remap describe-function] . helpful-callable) @@ -68,7 +65,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 +78,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 +95,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)) diff --git a/modules/rosenthal/examples/emacs/init-miscellaneous.el b/modules/rosenthal/examples/emacs/init-miscellaneous.el index 6cec99c..18b5085 100644 --- a/modules/rosenthal/examples/emacs/init-miscellaneous.el +++ b/modules/rosenthal/examples/emacs/init-miscellaneous.el @@ -1,6 +1,5 @@ ;;; -*- lexical-binding: t -*- -;;guix:emacs-daemons (use-package daemons :custom (daemons-list-fill-frame t)) @@ -18,12 +17,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 +32,5 @@ (:map project-prefix-map ("m" . magit-project-status))) -;;guix:emacs-forge (use-package forge :after (magit)) diff --git a/modules/rosenthal/examples/emacs/init.el b/modules/rosenthal/examples/emacs/init.el index 84da504..2edaf93 100644 --- a/modules/rosenthal/examples/emacs/init.el +++ b/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)) diff --git a/modules/rosenthal/examples/emacs/install.sh b/modules/rosenthal/examples/emacs/install.sh index 7f52d3f..03524fe 100755 --- a/modules/rosenthal/examples/emacs/install.sh +++ b/modules/rosenthal/examples/emacs/install.sh @@ -1,7 +1,4 @@ #!/bin/sh - -grep --recursive --no-filename '^;;guix:' . | - sed --regexp-extended 's/^;;guix:(.*)/"\1"/g' | - xargs guix install emacs-pgtk - -[[ ! -e ~/.config/emacs/init.el ]] && cp --recursive . ~/.config/emacs +dir="$(dirname "$(realpath "$0")")" +[[ ! -e ~/.config/emacs/init.el ]] && cp --recursive "$dir/." ~/.config/emacs +guix package --install --manifest="$dir/manifest.scm" --dry-run diff --git a/modules/rosenthal/examples/emacs/manifest.scm b/modules/rosenthal/examples/emacs/manifest.scm new file mode 100644 index 0000000..cc4a398 --- /dev/null +++ b/modules/rosenthal/examples/emacs/manifest.scm @@ -0,0 +1,30 @@ +(use-modules (gnu packages)) + +(specifications->manifest + '("emacs-pgtk" + "emacs-corfu" + "emacs-daemons" + "emacs-doom-modeline" + "emacs-envrc" + "emacs-flycheck" + "emacs-flycheck-guile" + "emacs-forge" + "emacs-gcmh" + "emacs-geiser" + "emacs-geiser-guile" + "emacs-helpful" + "emacs-hl-todo" + "emacs-macrostep" + "emacs-macrostep-geiser" + "emacs-magit" + "emacs-mwim" + "emacs-no-littering" + "emacs-orderless" + "emacs-puni" + "emacs-rainbow-delimiters" + "emacs-vertico" + "font-adobe-source-serif" + "font-google-noto-emoji" + "font-sarasa-gothic" + "font-victor-mono" + ))