oni/home/config/rincewind.scm

@@ -23,9 +23,7 @@
   #:use-module ((gnu packages emacs-xyz)
                 #:select (emacs-org-roam
                           emacs-guix
-                          emacs-org-contacts
+                          emacs-org-contacts))
-                          emacs-company
-                          emacs-fennel-mode))
   #:use-module ((gnu packages file-systems)
                 #:select (tmsu))
   #:use-module ((gnu packages forth)
@@ -141,7 +139,7 @@
                 #:select (count-emails))
   #:use-module ((oni packages emacs)
                 #:select (emacs-inkplate
-                          oni-emacs-company
+                          oni-emacs-notmuch
                           emacs-outli
                           emacs-syncthing-status))
   #:use-module ((oni packages emacs-config)
@@ -190,8 +188,7 @@
                           emacs-oni-sh
                           emacs-oni-shr
                           emacs-oni-tramp
-                          emacs-oni-embrace
+                          emacs-oni-embrace))
-                          emacs-oni-yaml))
   #:use-module ((oni packages hlwm-run-or-raise)
                 #:select (hlwm-run-or-raise))
   #:use-module ((oni packages inbox-size)
@@ -208,8 +205,6 @@
                 #:select (shutdown-rofi))
   #:use-module ((oni packages stumpwm)
                 #:select (stumpwm+swank))
-  #:use-module ((oni packages terminals)
-                #:select (tym))
   #:use-module ((oop goops)
                 #:select (make)))
 
@@ -219,8 +214,8 @@
     `((with-branch . ,(string-append (package-name package) "=master"))))
    package))
 
-(define with-my-emacs-company-package
+(define with-my-emacs-notmuch-package
-  (package-input-rewriting `((,emacs-company . ,oni-emacs-company))))
+  (package-input-rewriting `((,emacs-notmuch . ,oni-emacs-notmuch))))
 
 (define rincewind-picom-service
   (service home-picom-service-type
@@ -271,18 +266,17 @@
                  emacs-syncthing-status
                  emacs-outli
                  emacs-guix
-                 emacs-fennel-mode
 
                  (emacs-oni-org-roam my-emacs)
-                 (with-my-emacs-company-package emacs-oni-elisp)
+                 emacs-oni-elisp
                  emacs-oni-core
                  emacs-oni-elfeed
-                 (with-my-emacs-company-package emacs-oni-eshell)
+                 emacs-oni-eshell
                  emacs-oni-compilation
-                 (with-my-emacs-company-package emacs-oni-common-lisp)
+                 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
@@ -290,12 +284,12 @@
                  emacs-oni-browse-url
                  emacs-oni-c
                  emacs-oni-circe
-                 (with-my-emacs-company-package emacs-oni-clojure)
+                 emacs-oni-clojure
-                 (with-my-emacs-company-package emacs-oni-cmake)
+                 emacs-oni-cmake
                  emacs-oni-conf
-                 (with-my-emacs-company-package emacs-oni-cpp)
+                 emacs-oni-cpp
-                 (with-my-emacs-company-package emacs-oni-csharp)
+                 emacs-oni-csharp
-                 (with-my-emacs-company-package emacs-oni-css)
+                 emacs-oni-css
                  emacs-oni-diff-hl
                  emacs-oni-ediff
                  emacs-oni-elm
@@ -315,11 +309,10 @@
                  emacs-oni-nxml
                  emacs-oni-package
                  emacs-oni-projectile
-                 (with-my-emacs-company-package emacs-oni-scheme)
+                 emacs-oni-scheme
                  emacs-oni-sh
                  emacs-oni-shr
                  emacs-oni-tramp
-                 emacs-oni-yaml
 
                  tree-sitter-bash
                  tree-sitter-scheme
@@ -333,9 +326,7 @@
                  ;; Might be needed for certain icons?
                  hicolor-icon-theme
                  ;; Might be needed for cetrificates
-                 nss-certs
+                 nss-certs))
-
-                 tym))
 
  (services
   (list

oni/home/services/emacs/init.el

@@ -50,12 +50,3 @@
 (with-eval-after-load 'electric
   (add-hook 'electric-quote-inhibit-functions #'oni-in-word-p))
 
-(with-eval-after-load 'yaml-mode (require 'oni-yaml))
-
-(defvar epg-gpg-program)
-(with-eval-after-load 'epg-config
-  ;; This is necessary because otherwise Emacs will select the wrong version of
-  ;; GnuPG through gpg2. gpg is installed by Guix and gpg2 by Archlinux. EPG
-  ;; seems to prefer gpg2 over gpg and now it seems that the versions of both
-  ;; have diverged enough that it now matters which is used.
-  (setq epg-gpg-program "gpg"))

oni/packages/emacs-config.scm

@@ -12,7 +12,7 @@
   #:use-module (oni packages emacs))
 
 (define-public emacs-oni-config
-  (let ((commit "68d911f08d5e6559f20c89eadcc8741bf6d3f5e1")
+  (let ((commit "3b26004f8bffea707487b0a332381b59362143d4")
         (revision "0"))
     (package
       (name "emacs-oni-config")
@@ -25,7 +25,7 @@
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "190jzwq00c1pw15jri4qfp2ad44ykl1ax1jnq8k1fyki7p8z82b7"))))
+          (base32 "105rflg55wi8ms8qhxqjycpj81chqq6cswannvyjjfqjl54rffyp"))))
       (build-system emacs-build-system)
       (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
       (synopsis "My Emacs configuration")
@@ -875,20 +875,3 @@ Emacs")))
       emacs-magit))
     (synopsis "My configuration for git-commit-mode")
     (description "This package provides my configuration for git-commit-mode.")))
-
-(define-public emacs-oni-yaml
-  (package
-    (inherit emacs-oni-config)
-    (name "emacs-oni-yaml")
-    (arguments
-     '(#:include '("oni-yaml\\.el$")))
-    (propagated-inputs
-     (list
-      emacs-yaml-mode
-      emacs-oni-flycheck
-      emacs-oni-highlight-indent-guides
-      emacs-indent-tools
-      emacs-yaml-imenu
-      emacs-yaml-pro))
-    (synopsis "My configuration for yaml-mode.")
-    (description "This package provides my configuration for editing Yaml files.")))

oni/packages/emacs.scm

@@ -9,33 +9,103 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages emacs-xyz)
   #:use-module ((gnu packages mail)
-                #:select (notmuch))
+                #:select (notmuch)))
-  #:use-module (gnu packages ruby)
-  #:use-module (rosenthal packages tree-sitter))
 
-(define-public emacs-ace-link-notmuch
+(define-public emacs-inkplate
-  (let ((commit "fb09673881ef0f7b7ad744c576a19f578df7c51d")
+  (let ((commit "0897721a7b3d84aa3f200ae85fddd5fdd370fc42")
         (revision "0"))
     (package
-     (name "emacs-ace-link-notmuch")
+     (name "emacs-inkplate")
-     (version (git-version "0.0.0" revision commit))
+     (version (git-version "0.0.1" revision commit))
      (source
       (origin
        (uri (git-reference
-             (url "https://git.sr.ht/~ryuslash/ace-link-notmuch")
+             (url "https://git.sr.ht/~ryuslash/inkplatel")
              (commit commit)))
        (method git-fetch)
        (sha256
-        (base32 "1wpdimvwkrbic0hybsp5pqaql066yvl1aar37fr5kcm19gbgvcf6"))
+        (base32 "0mqnpf4vrzn3013pcwcr9150k4jy4klrdg0pd3amhg2y25054w4s"))
        (file-name (git-file-name name version))))
-     (propagated-inputs
-       (list emacs-ace-link))
      (build-system emacs-build-system)
-     (synopsis "ace-link functionality for notmuch")
+     (synopsis "Interface for my Inkplate")
      (description
-      "ace-link functionality for notmuch")
+      "This package provides a way to communicate with Inkplate in peripheral mode.")
      (license license:gpl3+)
-     (home-page "https://sr.ht/~ryuslash/ace-link-notmuch/"))))
+     (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"))))
+
+(define-public emacs-embrace
+  (package
+   (name "emacs-embrace")
+   (version "0.1.4")
+   (source
+    (origin
+      (uri (git-reference
+            (url "https://github.com/cute-jumper/embrace.el")
+            (commit version)))
+      (method git-fetch)
+      (file-name (git-file-name name version))
+      (sha256
+       (base32 "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"))))
+   (build-system emacs-build-system)
+   (propagated-inputs
+    `(("emacs-expand-region" ,emacs-expand-region)))
+   (home-page "https://github.com/cute-jumper/embrace.el")
+   (synopsis "Add/Change/Delete pairs based on `expand-region', similar to `evil-surround'")
+   (description "This package is heavily inspired by evil-surround (which is a port of the vim
+plugin surround.vim). But instead of using evil and its text objects, this
+package relies on another excellent package expand-region.
+
+For Emacs users who don’t like evil and thus don’t use evil-surround, embrace
+provides similar commands that can be found in evil-surround. Evil is absolutely
+not required. For evil-surround users, embrace can make your evil-surround
+commands even better! (Have you noticed that evil-surround doesn’t work on many
+custom pairs?)")
+   (license license:gpl3+)))
+
+(define-public emacs-insert-char-preview
+  (let ((commit "0e4a62b5407fb1bed8920a4c13cf9a91065e15ad")
+        (revision "0"))
+   (package
+     (name "emacs-insert-char-preview")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+        (uri (git-reference
+              (url "https://gitlab.com/matsievskiysv/insert-char-preview")
+              (commit commit)))
+        (method git-fetch)
+        (file-name (git-file-name name version))
+        (sha256
+         (base32 "0cqc23y9n63a7kl2p1zrfcsxnclfxcszfmbh2hmbrs6q05ys0kzg"))))
+     (build-system emacs-build-system)
+     (home-page "https://gitlab.com/matsievskiysv/insert-char-preview")
+     (synopsis "Insert Unicode char")
+     (description "Insert Unicode char via insert-char-preview similar to insert-char command, but
+with character preview in completion prompt.")
+     (license license:gpl3+))))
 
 (define-public emacs-bats
   (let ((commit "d519f7c89f5ae17dfc33400596df4564b478315f")
@@ -61,29 +131,6 @@ bats-mode derives from the bash flavor of sh-mode, adding font-lock for bats
 keywords.")
      (license license:gpl2+))))
 
-(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"))))
-
 (define-public emacs-docstr
   (let ((commit "4a991860c1259657c07c726bc482c97a1f597394")
         (revision "0"))
@@ -108,6 +155,84 @@ keywords.")
 strings into code.")
       (license license:gpl3+))))
 
+(define-public emacs-flycheck-posframe
+  (let ((commit "8f60c9bf124ab9597d681504a73fdf116a0bde12")
+        (revision "0"))
+    (package
+     (name "emacs-flycheck-posframe")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://github.com/alexmurray/flycheck-posframe")
+             (commit commit)))
+       (method git-fetch)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qh9hzvs95jvfrspglzkwhfq6a5pinab94bbh5vzkg8jc2fq6drf"))))
+     (build-system emacs-build-system)
+     (propagated-inputs
+      `(("emacs-flycheck" ,emacs-flycheck)
+        ("emacs-posframe" ,emacs-posframe)))
+     (home-page "https://github.com/alexmurray/flycheck-posframe")
+     (synopsis "Show flycheck errors via posframe.el")
+     (description "Show flycheck errors via posframe.el")
+     (license license:gpl3+))))
+
+(define-public emacs-flycheck-cask
+  (package
+   (name "emacs-flycheck-cask")
+   (version "0.4")
+   (source
+    (origin
+     (uri (git-reference
+           (url "https://github.com/flycheck/flycheck-cask")
+           (commit version)))
+     (method git-fetch)
+     (file-name (git-file-name name version))
+     (sha256
+      (base32 "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"))))
+   (build-system emacs-build-system)
+   (propagated-inputs
+    `(("emacs-flycheck" ,emacs-flycheck)
+      ("emacs-dash" ,emacs-dash)))
+   (home-page "https://github.com/flycheck/flycheck-cask")
+   (synopsis "Cask support for Flycheck")
+   (description "Make Flycheck use Cask packages in Cask projects.")
+   (license license:gpl3+)))
+
+(define-public emacs-nroam
+  (package
+   (name "emacs-nroam")
+   (version "20210325.2015")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append
+           "https://melpa.org/packages/nroam-"
+           version
+           ".tar"))
+     (sha256
+      (base32
+       "1aybc2k8kyf2dlpbq39p3k1nsvzrhw58xarbwwq0qgz91r49m4xq"))))
+   (build-system emacs-build-system)
+   (propagated-inputs
+    `(("emacs-org-roam" ,emacs-org-roam)
+      ("emacs-org" ,emacs-org)))
+   (home-page
+    "https://github.com/NicolasPetton/nroam")
+   (synopsis
+    "Org-roam backlinks within org-mode buffers")
+   (description
+    "nroam is a supplementary package for org-roam that replaces the backlink side
+buffer of Org-roam.  Instead, it displays org-roam backlinks at the end of
+org-roam buffers.
+
+To setup nroam for all org-roam buffers, evaluate the following:
+(add-hook 'org-mode-hook #'nroam-setup-maybe)
+")
+   (license license:gpl3+)))
+
 (define-public emacs-eldoc-cmake
   (package
    (name "emacs-eldoc-cmake")
@@ -156,35 +281,6 @@ See function `eldoc-cmake-enable'.
       (description "This package is format by itself, so you can view format effect.")
       (license license:gpl3+))))
 
-(define-public emacs-embrace
-  (package
-   (name "emacs-embrace")
-   (version "0.1.4")
-   (source
-    (origin
-      (uri (git-reference
-            (url "https://github.com/cute-jumper/embrace.el")
-            (commit version)))
-      (method git-fetch)
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"))))
-   (build-system emacs-build-system)
-   (propagated-inputs
-    `(("emacs-expand-region" ,emacs-expand-region)))
-   (home-page "https://github.com/cute-jumper/embrace.el")
-   (synopsis "Add/Change/Delete pairs based on `expand-region', similar to `evil-surround'")
-   (description "This package is heavily inspired by evil-surround (which is a port of the vim
-plugin surround.vim). But instead of using evil and its text objects, this
-package relies on another excellent package expand-region.
-
-For Emacs users who don’t like evil and thus don’t use evil-surround, embrace
-provides similar commands that can be found in evil-surround. Evil is absolutely
-not required. For evil-surround users, embrace can make your evil-surround
-commands even better! (Have you noticed that evil-surround doesn’t work on many
-custom pairs?)")
-   (license license:gpl3+)))
-
 (define-public emacs-erefactor
   (let ((commit "bfe27a1b8c7cac0fe054e76113e941efa3775fe8")
         (revision "0"))
@@ -206,73 +302,6 @@ custom pairs?)")
       (description "Simple refactoring, linting utilities for Emacs-Lisp.")
       (license license:gpl3+))))
 
-(define-public emacs-eshell-fringe-status
-  (let ((commit "047e9b9c75a39ac9f903bab937918165261d44f8")
-        (revision "0"))
-    (package
-      (name "emacs-eshell-fringe-status")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/eshell-fringe-status.git")
-               (commit commit)))
-         (method git-fetch)
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0frx1lc0rf6p01m5gjyaazl64f839856qn88v263rdls5rpncmz9"))))
-      (build-system emacs-build-system)
-      (home-page "https://code.ryuslash.org/ryuslash/eshell-fringe-status")
-      (synopsis "Show last status in fringe")
-      (description "Show last status in fringe")
-      (license license:gpl3+))))
-
-(define-public emacs-flycheck-cask
-  (package
-   (name "emacs-flycheck-cask")
-   (version "0.4")
-   (source
-    (origin
-     (uri (git-reference
-           (url "https://github.com/flycheck/flycheck-cask")
-           (commit version)))
-     (method git-fetch)
-     (file-name (git-file-name name version))
-     (sha256
-      (base32 "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"))))
-   (build-system emacs-build-system)
-   (propagated-inputs
-    `(("emacs-flycheck" ,emacs-flycheck)
-      ("emacs-dash" ,emacs-dash)))
-   (home-page "https://github.com/flycheck/flycheck-cask")
-   (synopsis "Cask support for Flycheck")
-   (description "Make Flycheck use Cask packages in Cask projects.")
-   (license license:gpl3+)))
-
-(define-public emacs-flycheck-posframe
-  (let ((commit "8f60c9bf124ab9597d681504a73fdf116a0bde12")
-        (revision "0"))
-    (package
-     (name "emacs-flycheck-posframe")
-     (version (git-version "0.0.0" revision commit))
-     (source
-      (origin
-       (uri (git-reference
-             (url "https://github.com/alexmurray/flycheck-posframe")
-             (commit commit)))
-       (method git-fetch)
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0qh9hzvs95jvfrspglzkwhfq6a5pinab94bbh5vzkg8jc2fq6drf"))))
-     (build-system emacs-build-system)
-     (propagated-inputs
-      `(("emacs-flycheck" ,emacs-flycheck)
-        ("emacs-posframe" ,emacs-posframe)))
-     (home-page "https://github.com/alexmurray/flycheck-posframe")
-     (synopsis "Show flycheck errors via posframe.el")
-     (description "Show flycheck errors via posframe.el")
-     (license license:gpl3+))))
-
 (define-public emacs-flycheck-relint
   (let ((commit "84b66d364ba583c1d5173a326997d11c6946b463")
         (revision "0"))
@@ -298,6 +327,124 @@ custom pairs?)")
 in Emacs Lisp files, using relint.")
       (license license:gpl3+))))
 
+(define-public emacs-outli
+  (let ((commit "f16f3ab90c5e4194b62f461e82f01709ae80f6e9")
+        (revision "0"))
+    (package
+     (name "emacs-outli")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://github.com/jdtsmith/outli")
+             (commit commit)))
+       (method git-fetch)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "03xirf5q6n1iy3h1gqhzwbiw7vadfmna1h3gkfkdrjqfd3jjq6qm"))))
+     (build-system emacs-build-system)
+     (home-page "https://github.com/jdtsmith/outli")
+     (synopsis "Simple comment-based outlines for Emacs")
+     (description "outli is a simple Emacs outliner for code, documents, and more which styles your
+headings, and emulates org-mode navigation and structure editing. It is based on
+the built-in outline-minor-mode and is simple by design, providing just a few
+key features.")
+     (license license:gpl3+))))
+
+(define-public emacs-eshell-fringe-status
+  (let ((commit "047e9b9c75a39ac9f903bab937918165261d44f8")
+        (revision "0"))
+    (package
+      (name "emacs-eshell-fringe-status")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://code.ryuslash.org/ryuslash/eshell-fringe-status.git")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0frx1lc0rf6p01m5gjyaazl64f839856qn88v263rdls5rpncmz9"))))
+      (build-system emacs-build-system)
+      (home-page "https://code.ryuslash.org/ryuslash/eshell-fringe-status")
+      (synopsis "Show last status in fringe")
+      (description "Show last status in fringe")
+      (license license:gpl3+))))
+
+(define-public emacs-yoshi-theme
+  (let ((commit "8faa406152f76452bda765ed4dafd41cd67f3afb")
+        (revision "0"))
+    (package
+      (name "emacs-yoshi-theme")
+      (version (git-version "7.0.0" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://code.ryuslash.org/ryuslash/yoshi-theme.git")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0bb5mf194iw72w7zcvs9jmlxx5ngvslx5i6c6rna9bj3y0zm8jlb"))))
+      (build-system emacs-build-system)
+      (home-page "https://code.ryuslash.org/ryuslash/yoshi-theme")
+      (synopsis "Emacs theme named after my cat")
+      (description "My cat is named Yoshi and I was just working on a random new theme, which was
+new-theme for a while. I couldn't think of a name so I named it after him.")
+      (license license:gpl3+))))
+
+(define-public emacs-yasnippet-capf
+  (let ((commit "40654214db7a44db3a99321447632b43a10fae57")
+        (revision "0"))
+    (package
+      (name "emacs-yasnippet-capf")
+      (version (git-version "7.0.0" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://github.com/elken/yasnippet-capf.git")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1kywl7jblrmixr0vwycpil5hyk4p5qlc3gxg9w25xga4jj91r663"))))
+      (propagated-inputs
+       (list emacs-yasnippet))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/elken/yasnippet-capf")
+      (synopsis "Completion-At-Point Extension for YASnippet")
+      (description "A simple capf (Completion-At-Point Function) for completing yasnippet snippets.")
+      (license license:gpl3))))
+
+(define-public oni-emacs-notmuch
+  (package
+    (inherit notmuch)
+    (name "oni-emacs-notmuch")
+    (build-system emacs-build-system)
+    (native-inputs '())
+    (inputs
+     (list notmuch))
+    (arguments
+     (list
+      #:exclude #~(cons* "make-deps.el" "rstdoc.el" %default-exclude)
+      #:include #~(cons* "notmuch-logo.svg" %default-include)
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "emacs")))
+          (add-after 'chdir 'patch-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((notmuch (search-input-file inputs "/bin/notmuch")))
+                (substitute* "notmuch-lib.el"
+                  (("\"notmuch\"")
+                   (string-append "\"" notmuch "\"")))))))))
+    (synopsis "Run Notmuch within Emacs")
+    (description
+     "This package provides an Emacs-based interface to the Notmuch mail
+system.")))
+
 (define-public emacs-golden-ratio
   (let ((commit "375c9f287dfad68829582c1e0a67d0c18119dab9")
         (revision "0"))
@@ -326,157 +473,6 @@ not being actively edited will be re-sized to a smaller size that doesn't get in
 the way, but at the same time will be readable enough to know it's content.")
       (license license:expat))))
 
-(define-public emacs-indent-bars
-  (package
-    (name "emacs-indent-bars")
-    (version "0.2.3")
-    (source
-     (origin
-       (uri (git-reference
-             (url "https://github.com/jdtsmith/indent-bars")
-             (commit (string-append "v" version))))
-       (method git-fetch)
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0mis93rh01i1zk8bix79l3q46zrfwlkpq1c1l6msng22ydxs1mw1"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     (list emacs-compat))
-    (home-page "https://github.com/jdtsmith/indent-bars")
-    (synopsis "Fast, configurable indentation guide-bars for Emacs.")
-    (description "This package provides vertical indentation guide bars")
-    (license license:gpl3+)))
-
-(define-public emacs-indent-tools
-  (let ((commit "c731f05fa3950e2e8580ec61b88abbc705639830")
-        (revision "0"))
-    (package
-      (name "emacs-indent-tools")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (uri (git-reference
-               (url "https://gitlab.com/emacs-stuff/indent-tools.git")
-               (commit commit)))
-         (method git-fetch)
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0jri2vxd5a4sx93xq6kjcc5zx9yrhv789x3lyq6r2p2422diw2jr"))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       (list emacs-s
-             emacs-hydra
-             emacs-yafolding))
-      (home-page "https://gitlab.com/emacs-stuff/indent-tools/")
-      (synopsis "Indent, navigate around and act on indentation units: perfect for yaml, python
-and the like.")
-      (description "Indent,  move around  and  act  on code  based  on indentation  (yaml,
-  python, jade, etc).
-
-Meant for indentation-based languages, but can be used any time with indented
-text.")
-      ;; I'm not sure this license is correct, there doesn't seem to be a wtfpl
-      ;; v1 in the licenses file.
-      (license license:wtfpl2))))
-
-(define-public emacs-inkplate
-  (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/"))))
-
-(define-public emacs-insert-char-preview
-  (let ((commit "0e4a62b5407fb1bed8920a4c13cf9a91065e15ad")
-        (revision "0"))
-   (package
-     (name "emacs-insert-char-preview")
-     (version (git-version "0.0.0" revision commit))
-     (source
-      (origin
-        (uri (git-reference
-              (url "https://gitlab.com/matsievskiysv/insert-char-preview")
-              (commit commit)))
-        (method git-fetch)
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "0cqc23y9n63a7kl2p1zrfcsxnclfxcszfmbh2hmbrs6q05ys0kzg"))))
-     (build-system emacs-build-system)
-     (home-page "https://gitlab.com/matsievskiysv/insert-char-preview")
-     (synopsis "Insert Unicode char")
-     (description "Insert Unicode char via insert-char-preview similar to insert-char command, but
-with character preview in completion prompt.")
-     (license license:gpl3+))))
-
-(define-public emacs-nroam
-  (package
-   (name "emacs-nroam")
-   (version "20210325.2015")
-   (source
-    (origin
-     (method url-fetch)
-     (uri (string-append
-           "https://melpa.org/packages/nroam-"
-           version
-           ".tar"))
-     (sha256
-      (base32
-       "1aybc2k8kyf2dlpbq39p3k1nsvzrhw58xarbwwq0qgz91r49m4xq"))))
-   (build-system emacs-build-system)
-   (propagated-inputs
-    `(("emacs-org-roam" ,emacs-org-roam)
-      ("emacs-org" ,emacs-org)))
-   (home-page
-    "https://github.com/NicolasPetton/nroam")
-   (synopsis
-    "Org-roam backlinks within org-mode buffers")
-   (description
-    "nroam is a supplementary package for org-roam that replaces the backlink side
-buffer of Org-roam.  Instead, it displays org-roam backlinks at the end of
-org-roam buffers.
-
-To setup nroam for all org-roam buffers, evaluate the following:
-(add-hook 'org-mode-hook #'nroam-setup-maybe)
-")
-   (license license:gpl3+)))
-
-(define-public emacs-outli
-  (package
-    (name "emacs-outli")
-    (version "0.1.0")
-    (source
-     (origin
-       (uri (git-reference
-             (url "https://github.com/jdtsmith/outli")
-             (commit (string-append "v" version))))
-       (method git-fetch)
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1yyh334r26pjgcx51rrxacwiranysnhbdz83xgpjwaby280xwlgb"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/jdtsmith/outli")
-    (synopsis "Simple comment-based outlines for Emacs")
-    (description "outli is a simple Emacs outliner for code, documents, and more which styles your
-headings, and emulates org-mode navigation and structure editing. It is based on
-the built-in outline-minor-mode and is simple by design, providing just a few
-key features.")
-    (license license:gpl3+)))
-
 (define-public emacs-syncthing-status
   (let ((commit "3d521e3929cc4e4060205b969a1a37f516758b77")
         (revision "0"))
@@ -502,154 +498,48 @@ Syncthing REST API and request package to get this data and display it in an
 Emacs buffer.")
       (license license:expat))))
 
-(define-public emacs-yafolding
+(define-public emacs-outli
   (package
-    (name "emacs-yafolding")
+    (name "emacs-outli")
-    (version "0.4.1")
+    (version "0.1.0")
     (source
      (origin
        (uri (git-reference
-             (url "https://github.com/emacsorphanage/yafolding")
+             (url "https://github.com/jdtsmith/outli")
              (commit (string-append "v" version))))
        (method git-fetch)
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1bb763lx5cs5z06irjllip8z9c61brjsamfcjajibi24wcajkprx"))))
+        (base32 "1yyh334r26pjgcx51rrxacwiranysnhbdz83xgpjwaby280xwlgb"))))
     (build-system emacs-build-system)
-    (home-page "https://github.com/emacsorphanage/yafolding")
+    (home-page "https://github.com/jdtsmith/outli")
-    (synopsis "Yet another folding extension for Emacs")
+    (synopsis "Simple comment-based outlines for Emacs")
-    (description "Folding code blocks based on indentation.")
+    (description "outli is a simple Emacs outliner for code, documents, and more which styles your
+headings, and emulates org-mode navigation and structure editing. It is based on
+the built-in outline-minor-mode and is simple by design, providing just a few
+key features.")
     (license license:gpl3+)))
 
-(define-public emacs-yaml-imenu
+(define-public emacs-ace-link-notmuch
-  (let ((commit "c1fbba8b03a7bef4fc2b87404914fa9c6eb67b55")
+  (let ((commit "fb09673881ef0f7b7ad744c576a19f578df7c51d")
         (revision "0"))
-   (package
+    (package
-     (name "emacs-yaml-imenu")
+     (name "emacs-ace-link-notmuch")
-     (version (git-version "1.0.3" revision commit))
+     (version (git-version "0.0.0" revision commit))
      (source
       (origin
-        (uri (git-reference
-              (url "https://github.com/knu/yaml-imenu.el")
-              (commit commit)))
-        (method git-fetch)
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "1p5zyjj9hvqjfhyp68c04w6cxj5qh4psd4y8kafyrz3n05wimzl5"))))
-     (build-system emacs-build-system)
-     (inputs
-      (list ruby
-            emacs-yaml-mode))
-     (home-page "https://github.com/knu/yaml-imenu.el")
-     (synopsis "Enhancement for the imenu support in yaml-mode")
-     (description "This package enhances the imenu support in yaml-mode. It generates an index
-containing a full list of keys that contain any child, with key names in the
-dot-separated path form like @code{jobs.build.docker} and
-@code{ja.activerecord.attributes.user.nickname}. It shines best with
-@code{which-function-mode} enabled.")
-     (license license:bsd-2))))
-
-(define-public emacs-yaml-pro
-  (package
-    (name "emacs-yaml-pro")
-    (version "0.3.4")
-    (source
-     (origin
        (uri (git-reference
-             (url "https://github.com/zkry/yaml-pro")
+             (url "https://git.sr.ht/~ryuslash/ace-link-notmuch")
-             (commit (string-append "v" version))))
+             (commit commit)))
        (method git-fetch)
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "0zz8cl400grdip8c2jl27sf4prysyg0rcp91kah6qghmns87f3z9"))))
+        (base32 "1wpdimvwkrbic0hybsp5pqaql066yvl1aar37fr5kcm19gbgvcf6"))
-    (build-system emacs-build-system)
+       (file-name (git-file-name name version))))
-    (propagated-inputs
+     (propagated-inputs
-     (list emacs-yaml
+       (list emacs-ace-link))
-           tree-sitter-yaml))
+     (build-system emacs-build-system)
-    (home-page "https://github.com/zkry/yaml-pro")
+     (synopsis "ace-link functionality for notmuch")
-    (synopsis "Edit YAML in Emacs like a pro")
+     (description
-    (description "yaml-pro is a package that provides conveniences for editing yaml.
+      "ace-link functionality for notmuch")
-
+     (license license:gpl3+)
-This package has been written to leverage tree-sitter parsing facilities,
+     (home-page "https://sr.ht/~ryuslash/ace-link-notmuch/"))))
-allowing all of these actions to be performed fast and accurate, even in the
-absence of parsing errors. The tree-sitter version is orders of magnitudes
-faster and I highly recommend its usage if your Emacs version permits.")
-    (license license:gpl3+)))
-
-(define-public emacs-yasnippet-capf
-  (let ((commit "40654214db7a44db3a99321447632b43a10fae57")
-        (revision "0"))
-    (package
-      (name "emacs-yasnippet-capf")
-      (version (git-version "7.0.0" revision commit))
-      (source
-       (origin
-         (uri (git-reference
-               (url "https://github.com/elken/yasnippet-capf.git")
-               (commit commit)))
-         (method git-fetch)
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1kywl7jblrmixr0vwycpil5hyk4p5qlc3gxg9w25xga4jj91r663"))))
-      (propagated-inputs
-       (list emacs-yasnippet))
-      (build-system emacs-build-system)
-      (home-page "https://github.com/elken/yasnippet-capf")
-      (synopsis "Completion-At-Point Extension for YASnippet")
-      (description "A simple capf (Completion-At-Point Function) for completing yasnippet snippets.")
-      (license license:gpl3))))
-
-(define-public emacs-yoshi-theme
-  (let ((commit "8faa406152f76452bda765ed4dafd41cd67f3afb")
-        (revision "0"))
-    (package
-      (name "emacs-yoshi-theme")
-      (version (git-version "7.0.0" revision commit))
-      (source
-       (origin
-         (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/yoshi-theme.git")
-               (commit commit)))
-         (method git-fetch)
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0bb5mf194iw72w7zcvs9jmlxx5ngvslx5i6c6rna9bj3y0zm8jlb"))))
-      (build-system emacs-build-system)
-      (home-page "https://code.ryuslash.org/ryuslash/yoshi-theme")
-      (synopsis "Emacs theme named after my cat")
-      (description "My cat is named Yoshi and I was just working on a random new theme, which was
-new-theme for a while. I couldn't think of a name so I named it after him.")
-      (license license:gpl3+))))
-
-(define-public oni-emacs-company
-  (package
-    (name "oni-emacs-company")
-    (version "0.10.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://elpa.gnu.org/packages/"
-                           "company-" version ".tar"))
-       (sha256
-        (base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:include #~(cons* "icons/" %default-include)
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'move-doc 'install-doc-images
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((images (find-files "./images/small/" ".*\\.png$")))
-                (for-each (lambda (image)
-                            (install-file image
-                                          (string-append #$output "/share/info/images/small")))
-                          images)))))))
-    (home-page "https://company-mode.github.io/")
-    (synopsis "Modular text completion framework")
-    (description
-     "Company is a modular completion mechanism.  Modules for retrieving
-completion candidates are called back-ends, modules for displaying them are
-front-ends.  Company comes with many back-ends, e.g., @code{company-elisp}.
-These are distributed in separate files and can be used individually.")
-    (license license:gpl3+)))

oni/packages/terminals.scm

@@ -1,37 +0,0 @@
-(define-module (oni packages terminals)
-  #:use-module (guix packages)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages lua)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages pkg-config))
-
-(define-public tym
-  (package
-    (name "tym")
-    (version "3.5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/endaaman/tym.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "084db9nvzw5dj671m1qnp4yq1h7xp74gka5x5pyhzin7v167fxb9"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list
-      luajit
-      vte
-      autoconf
-      automake
-      pkg-config))
-    (arguments
-     '(#:configure-flags '("--enable-luajit")))
-    (home-page "https://github.com/endaaman/tym/")
-    (synopsis "Lua-configurable terminal emulator")
-    (description "tym is a Lua-configurable terminal emulator base on VTE.")
-    (license license:expat)))