From fac6e98dbf977ffaf716566e8b6d6f862bfb64ec Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Fri, 29 Sep 2023 14:35:02 -0700
Subject: Add custom emacs-notmuch package

This fixes a bug that exists in the package that the Notmuch logo doesn't show
up in notmuch-hello. I'll try and make a couple of other changes before opening
a pull request back to Guix to fix it.
---
 oni/home/config/rincewind.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'oni/home/config/rincewind.scm')

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 9f54bcb..d8600eb 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -53,7 +53,8 @@
                 #:select (local-file
                           mixed-text-file))
   #:use-module ((guix packages)
-                #:select (package-name))
+                #:select (package-name
+                          package-input-rewriting))
   #:use-module ((guix transformations)
                 #:select (options->transformation))
   #:use-module ((nongnu packages emacs)
@@ -119,7 +120,8 @@
   #:use-module ((oni packages count-emails)
                 #:select (count-emails))
   #:use-module ((oni packages emacs)
-                #:select (emacs-inkplate))
+                #:select (emacs-inkplate
+                          oni-emacs-notmuch))
   #:use-module ((oni packages emacs-config)
                 #:select (emacs-oni-org-roam
                           emacs-oni-vterm
@@ -195,6 +197,9 @@
     `((with-branch . ,(string-append (package-name package) "=master"))))
    package))
 
+(define with-my-emacs-notmuch-package
+  (package-input-rewriting `((,emacs-notmuch . ,oni-emacs-notmuch))))
+
 (define rincewind-picom-service
   (service home-picom-service-type
            (home-picom-configuration
@@ -262,7 +267,6 @@
                  tmsu
                  mpd-random-albums
                  notmuch
-                 emacs-notmuch
                  emacs-inkplate
                  emacs-outli
                  emacs-guix
@@ -277,7 +281,7 @@
                  emacs-oni-common-lisp
                  emacs-oni-gui
                  emacs-oni-magit
-                 emacs-oni-notmuch
+                 (with-my-emacs-notmuch-package emacs-oni-notmuch)
                  emacs-oni-hy
                  emacs-oni-project
                  emacs-oni-bookmark
-- 
cgit v1.2.3-54-g00ecf