commit 5e2cb7c16c9dd911ce94e3d165782f63e2717897
parent 28dda2bec4b6c0ed475d99ce1cb71c2152179cc5
Author: Vineet Kumar <git@vineetk.net>
Date: Tue, 3 Mar 2026 19:43:07 -0500
home: remove emacs channel and use guix import instead
well guix import as base (still needs minor changes like setting
correct version and commit but it's less of a hassle than I thought).
Diffstat:
3 files changed, 86 insertions(+), 26 deletions(-)
diff --git a/epistemia/channels.scm b/epistemia/channels.scm
@@ -1,12 +1,4 @@
(list (channel
- (name 'emacs)
- (url "https://github.com/garrgravarr/guix-emacs")
- (introduction
- (make-channel-introduction
- "5d4f66a7dec72a6e82bf2c6fd0193bbe6c4f62c8"
- (openpgp-fingerprint
- "2DDF 9601 2828 6172 F10C 51A4 E80D 3600 684C 71BA"))))
- (channel
(name 'nonguix)
(url "https://codeberg.org/nonguix/nonguix-mirror")
(branch "master")
diff --git a/epistemia/home/config.scm b/epistemia/home/config.scm
@@ -7,7 +7,6 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages emacs)
#:use-module (gnu packages emacs-xyz)
- #:use-module ((emacs packages melpa) #:prefix e/)
#:use-module (gnu packages finance)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang-crypto)
@@ -15,6 +14,7 @@
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages llvm)
#:use-module (gnu packages mail)
#:use-module (gnu packages messaging)
#:use-module (gnu packages music)
@@ -31,6 +31,7 @@
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (epistemia packages audio)
+ #:use-module (epistemia packages emacs)
#:use-module (epistemia packages minecraft)
#:use-module (epistemia packages qt)
#:use-module (nongnu packages game-client)
@@ -74,34 +75,34 @@
emacs
emacs-age
emacs-auctex
- e/emacs-citar
- e/emacs-citeproc
- e/emacs-clang-format
+ emacs-citar
+ emacs-citeproc
+ emacs-clang-format
emacs-consult
emacs-eat
emacs-elfeed
- e/emacs-esup
+ emacs-esup
emacs-exwm
- e/emacs-geiser
- e/emacs-geiser-guile
- e/emacs-gptel
- e/emacs-guix
- e/emacs-hl-todo
- e/emacs-kaolin-themes
+ emacs-geiser
+ emacs-geiser-guile
+ emacs-gptel
+ emacs-guix
+ emacs-hl-todo
+ emacs-kaolin-themes
emacs-ledger-mode
- e/emacs-magit
- e/emacs-magit-todos
+ emacs-magit
+ emacs-magit-todos
emacs-marginalia
- e/emacs-notmuch
+ emacs-notmuch
emacs-orderless
- e/emacs-org-mem
- e/emacs-org-node
+ emacs-org-mem
+ emacs-org-node
emacs-org-present
emacs-paredit
emacs-pdf-tools
emacs-rainbow-delimiters
- e/emacs-skeletor
- e/emacs-transient
+ emacs-skeletor
+ emacs-transient
emacs-undo-tree
emacs-vertico
diff --git a/epistemia/packages/emacs.scm b/epistemia/packages/emacs.scm
@@ -0,0 +1,67 @@
+(define-module (epistemia packages emacs)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system emacs)
+ #:use-module ((guix licenses) :prefix license:)
+ #:use-module (gnu packages emacs-build)
+ #:use-module (gnu packages emacs-xyz))
+
+(define-public emacs-kaolin-themes
+ (package
+ (name "emacs-kaolin-themes")
+ (version "1.7.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ogdenwebb/emacs-kaolin-themes")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1lbqvs2jqvs6x8gj7bali24mw2fl6gk184zln6avy6wmam7n8dqi"))))
+ (build-system emacs-build-system)
+ (propagated-inputs (list emacs-autothemer))
+ (arguments
+ '(#:include '("^[^/]*.el$" "^[^/]*.el.in$"
+ "^dir$"
+ "^[^/]*.info$"
+ "^[^/]*.texi$"
+ "^[^/]*.texinfo$"
+ "^doc/dir$"
+ "^doc/[^/]*.info$"
+ "^doc/[^/]*.texi$"
+ "^doc/[^/]*.texinfo$"
+ "^themes/[^/]*.el$")
+ #:exclude '("^.dir-locals.el$" "^test.el$" "^tests.el$"
+ "^[^/]*-test.el$" "^[^/]*-tests.el$")))
+ (home-page "https://github.com/ogdenwebb/emacs-kaolin-themes")
+ (synopsis "A set of eye pleasing themes")
+ (description
+ "Kaolin is a set of eye pleasing themes for GNU Emacs With support a large number
+of modes and external packages. Kaolin themes are based on the pallete that was
+originally inspired by Sierra.vim with adding some extra colors. ------- This
+package includes the following themes ------- * kaolin-dark - a dark jade
+variant inspired by Sierra.vim. * kaolin-light - light variant of the original
+kaolin-dark. * kaolin-aurora - Kaolin meets polar lights. * kaolin-bubblegum -
+Kaolin colorful theme with dark blue background. * kaolin-eclipse - a dark
+purple variant. * kaolin-galaxy - bright theme based on one of the Sebastian
+Andaur arts. * kaolin-mono-dark - almost monochrome dark green Kaolin theme. *
+kaolin-mono-light - light variant of monochrome theme. * kaolin-ocean - dark
+blue variant. * kaolin-shiva - theme with autumn colors and melanzane
+background. * kaolin-temple - dark brown background with syntax highlighting
+based on orange and cyan shades. * kaolin-valley-dark - colorful Kaolin theme
+with brown background. * kaolin-valley-light - light version of
+kaolin-valley-dark theme. ------- Configuration example ------- (require
+kaolin-themes) (load-theme kaolin-dark t) ;; Apply treemacs customization for
+Kaolin themes, requires the all-the-icons package. (kaolin-treemacs-theme) ;; Or
+if you have use-package installed (use-package kaolin-themes :config (load-theme
+kaolin-dark t) (kaolin-treemacs-theme)) ;; Custom theme settings ;; The
+following set to t by default (setq kaolin-themes-bold t ; If nil, disable the
+bold style. kaolin-themes-italic t ; If nil, disable the italic style.
+kaolin-themes-underline t) ; If nil, disable the underline style. ------- Some
+extra theme features, disabled by default ------- ;; If t, use the wave
+underline style instead of regular underline. (setq kaolin-themes-underline-wave
+t) ;; When t, will display colored hl-line style (setq
+kaolin-themes-hl-line-colored t).")
+ (license license:gpl3)))
