From 57c0693306348633ec61310021ad8f6308b391b9 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Sat, 12 Jun 2021 22:13:38 -0700
Subject: [PATCH] Add some more Emacs configuration packages

---
 oni/packages/emacs-config.scm | 78 +++++++++++++++++++++--------------
 oni/packages/emacs.scm        | 36 ++++++++--------
 2 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index 3027b6f..39d38dd 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -5,11 +5,11 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages emacs-xyz))
 
-(define-public emacs-oni-vterm
+(define-public emacs-oni-config
   (let ((commit "b1c7553275218dd89676a1136a0e0d708acd5bec")
         (revision "0"))
     (package
-      (name "emacs-oni-vterm")
+      (name "emacs-oni-config")
       (version (git-version "0.0.1" revision commit))
       (source
        (origin
@@ -21,36 +21,50 @@
          (sha256
           (base32 "1977csi34jgvvnsn2bv1rawnw1mqvw2j8i6g9c26l49wp7l63szi"))))
       (build-system emacs-build-system)
-      (arguments
-       '(#:include '("oni-vterm.el")))
-      (propagated-inputs
-       `(("emacs-vterm" ,emacs-vterm)))
-      (home-page "https://git.sr.ht/~ryuslash/emacs-config")
-      (synopsis "My Emacs vterm configuration")
-      (description "This package provides my configuration for emacs-vterm")
+      (home-page "https://sr.ht/~ryuslash/dotfiles/")
+      (synopsis "My Emacs configuration")
+      (description "This package provides my configuration for emacs")
       (license license:gpl3+))))
 
+(define-public emacs-oni-vterm
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-vterm")
+   (arguments
+    '(#:include '("oni-vterm.el")))
+   (propagated-inputs
+    `(("emacs-vterm" ,emacs-vterm)))
+   (synopsis "My Emacs vterm configuration")
+   (description "This package provides my configuration for emacs-vterm")))
+
 (define-public emacs-oni-elfeed
-  (let ((commit "b1c7553275218dd89676a1136a0e0d708acd5bec")
-        (revision "0"))
-    (package
-      (name "emacs-oni-elfeed")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.sr.ht/~ryuslash/emacs-config")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1977csi34jgvvnsn2bv1rawnw1mqvw2j8i6g9c26l49wp7l63szi"))))
-      (build-system emacs-build-system)
-      (arguments
-       '(#:include '("oni-elfeed.el")))
-      (propagated-inputs
-       `(("emacs-elfeed" ,emacs-elfeed)))
-      (home-page "https://git.sr.ht/~ryuslash/emacs-config")
-      (synopsis "My Emacs elfeed configuration")
-      (description "This package provides my configuration for emacs-elfeed")
-      (license license:gpl3+))))
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-elfeed")
+   (arguments
+    '(#:include '("oni-elfeed.el")))
+   (propagated-inputs
+    `(("emacs-elfeed" ,emacs-elfeed)))
+   (synopsis "My Emacs elfeed configuration")
+   (description "This package provides my configuration for emacs-elfeed")))
+
+(define-public emacs-oni-alert
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-alert")
+   (arguments
+    '(#:include '("oni-alert.el")))
+   (propagated-inputs
+    `(("emacs-alert" ,emacs-alert)))
+   (synopsis "My Emacs alert configuration")
+   (description "This package provides my configuration for emacs-alert")))
+
+(define-public emacs-oni-bookmark
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-bookmark")
+   (arguments
+    '(#:include '("oni-bookmark.el")))
+   (synopsis "My Emacs bookmark configuration")
+   (description "This package provides my configuration for the bookmark library
+in Emacs")))
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index 0783d61..a60fb4d 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -1,4 +1,4 @@
-(define-module (oni packages emacs-inkplate)
+(define-module (oni packages emacs)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (guix git-download)
@@ -9,20 +9,20 @@
   (let ((commit "0897721a7b3d84aa3f200ae85fddd5fdd370fc42")
         (revision "0"))
     (package
-      (name "emacs-inkplate")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (uri (git-reference
-               (url "https://git.sr.ht/~ryuslash/inkplatel")
-               (commit commit)))
-         (method git-fetch)
-         (sha256
-          (base32 "0mqnpf4vrzn3013pcwcr9150k4jy4klrdg0pd3amhg2y25054w4s"))
-         (file-name (git-file-name name version))))
-      (build-system emacs-build-system)
-      (synopsis "Interface for my Inkplate")
-      (description
-       "This package provides a way to communicate with Inkplate in peripheral mode.")
-      (license license:gpl3+)
-      (home-page "https://sr.ht/~ryuslash/inkplate/"))))
+     (name "emacs-inkplate")
+     (version (git-version "0.0.1" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://git.sr.ht/~ryuslash/inkplatel")
+             (commit commit)))
+       (method git-fetch)
+       (sha256
+        (base32 "0mqnpf4vrzn3013pcwcr9150k4jy4klrdg0pd3amhg2y25054w4s"))
+       (file-name (git-file-name name version))))
+     (build-system emacs-build-system)
+     (synopsis "Interface for my Inkplate")
+     (description
+      "This package provides a way to communicate with Inkplate in peripheral mode.")
+     (license license:gpl3+)
+     (home-page "https://sr.ht/~ryuslash/inkplate/"))))