From c215ab1333e9e5ab35c13123605c6724e78f202a Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 21 Jun 2021 23:15:09 -0700
Subject: [PATCH] Add oni-circe configuration

---
 oni/packages/emacs-config.scm | 28 +++++++++++++++++++++++++++-
 oni/packages/emacs.scm        | 26 +++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index 39d38dd..8c30407 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -3,7 +3,8 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system emacs)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages emacs-xyz))
+  #:use-module (gnu packages emacs-xyz)
+  #:use-module (oni packages emacs))
 
 (define-public emacs-oni-config
   (let ((commit "b1c7553275218dd89676a1136a0e0d708acd5bec")
@@ -68,3 +69,28 @@
    (synopsis "My Emacs bookmark configuration")
    (description "This package provides my configuration for the bookmark library
 in Emacs")))
+
+(define-public emacs-oni-lui
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-lui")
+   (arguments
+    '(#:include '("oni-lui.el")))
+   (propagated-inputs
+    `(("emacs-circe" ,emacs-circe)))
+   (synopsis "My Emacs Line-UI configuration")
+   (description "This package provides my configuration for the lui library in
+Emacs")))
+
+(define-public emacs-oni-circe
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-circe")
+   (arguments
+    '(#:include '("oni-circe.el")))
+   (propagated-inputs
+    `(("emacs-circe" ,emacs-circe)
+      ("emacs-circe-serenityc" ,emacs-circe-serenity)
+      ("emacs-oni-lui" ,emacs-oni-lui)))
+   (synopsis "My Emacs Circe configuration")
+   (description "This package provides my configuration for emacs-circe")))
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index a60fb4d..31a5278 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -3,7 +3,8 @@
   #:use-module (guix utils)
   #:use-module (guix git-download)
   #:use-module (guix build-system emacs)
-  #:use-module ((guix licenses) #:prefix license:))
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages emacs-xyz))
 
 (define-public emacs-inkplate
   (let ((commit "0897721a7b3d84aa3f200ae85fddd5fdd370fc42")
@@ -26,3 +27,26 @@
       "This package provides a way to communicate with Inkplate in peripheral mode.")
      (license license:gpl3+)
      (home-page "https://sr.ht/~ryuslash/inkplate/"))))
+
+(define-public emacs-circe-serenity
+  (let ((commit "6dbc0944755b198c923689c33e7287e444f6a310")
+        (revision "0"))
+    (package
+     (name "emacs-circe-serenity")
+     (version (git-version "0.0.1" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://github.com/ryuslash/circe-serenity.git")
+             (commit commit)))
+       (method git-fetch)
+       (sha256
+        (base32 "05fpbvqx6ii8kypv880j3mdc8kql7k16dcs42vpaaabjwn3kv4kn"))
+       (file-name (git-file-name name version))))
+     (build-system emacs-build-system)
+     (propagated-inputs
+      `(("emacs-circe" ,emacs-circe)))
+     (synopsis "Someone's idea of a more serene Circe configuration")
+     (description "A configuration for Circe")
+     (license license:gpl3)
+     (home-page "https://github.com/ryuslash/circe-serenity"))))