Update to latest emacs configuration

Dunst was moved from the ‘(gnu packages dunst)’ module to the ‘(gnu packages
wm)’ module in commit bf6fdf76b0fe19cbf5787795caac8edab6eeb439 of the Guix
repository.

oni/home/config/rincewind.scm

@@ -8,6 +8,9 @@
                           msmtp-account))
   #:use-module ((gnu home services guix)
                 #:select (home-channels-service-type))
+  #:use-module ((gnu home services gnupg)
+                #:select (home-gpg-agent-service-type
+                          home-gpg-agent-configuration))
   #:use-module ((gnu packages certs)
                 #:select (nss-certs))
   #:use-module ((gnu packages cdrom)
@@ -86,7 +89,8 @@
                           home-emacs-eros-service-type
                           home-emacs-ace-link-service-type
                           home-emacs-ace-link-configuration
-                          home-emacs-golden-ratio-service-type))
+                          home-emacs-golden-ratio-service-type
+                          home-emacs-pinentry-service-type))
   #:use-module ((oni home services environment)
                 #:select (home-environment-service))
   #:use-module ((oni home services flameshot)
@@ -132,7 +136,8 @@
                 #:select (count-emails))
   #:use-module ((oni packages emacs)
                 #:select (emacs-inkplate
-                          oni-emacs-notmuch))
+                          oni-emacs-notmuch
+                          emacs-syncthing-status))
   #:use-module ((oni packages emacs-config)
                 #:select (emacs-oni-org-roam
                           emacs-oni-vterm
@@ -279,6 +284,7 @@
                  mpd-random-albums
                  notmuch
                  emacs-inkplate
+                 emacs-syncthing-status
                  emacs-outli
                  emacs-guix
 
@@ -442,6 +448,7 @@
              (goto-address-key "C-S-e")
              (org-mode-key "C-S-e")))
    (service home-emacs-golden-ratio-service-type)
+   (service home-emacs-pinentry-service-type)
 
    (service home-flameshot-service-type)
 
@@ -520,4 +527,10 @@
                                      (host "smtp-ryuslash.alwaysdata.net")
                                      (from "tom@ryuslash.org")
                                      (user "tom@ryuslash.org"))))))
-             (default-account "ryuslash"))))))
+             (default-account "ryuslash")))
+
+   (service home-gpg-agent-service-type
+            (home-gpg-agent-configuration
+             (ssh-support? #t)
+             (extra-content
+              "allow-emacs-pinentry\n"))))))

oni/home/services/dunst.scm

@@ -3,7 +3,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-2)
   #:use-module (gnu services configuration)
-  #:use-module (gnu packages dunst)
+  #:use-module (gnu packages wm)
   #:use-module (gnu home services)
   #:use-module (gnu home services shepherd)
   #:use-module (gnu home services utils)

oni/home/services/emacs.scm

@@ -13,7 +13,8 @@
                 #:select (emacs-helpful
                           emacs-dashboard
                           emacs-eros
-                          emacs-ace-link))
+                          emacs-ace-link
+                          emacs-pinentry))
   #:use-module ((gnu home services)
                 #:select (service-type
                           service-extension
@@ -52,10 +53,15 @@
             home-emacs-ace-link-configuration
 
             home-emacs-golden-ratio-service-type
-            home-emacs-golden-ratio-configuration))
+            home-emacs-golden-ratio-configuration
+
+            home-emacs-pinentry-service-type
+            home-emacs-pinentry-configuration))
 
 (define-maybe string)
 
+;;; Emacs
+
 (define-configuration/no-serialization home-emacs-extension
   (configurations
    (text-config '())
@@ -116,6 +122,8 @@
    (default-value (home-emacs-configuration))
    (description "Install and configure Emacs.")))
 
+;;; Emacs Helpful
+
 (define-configuration/no-serialization home-emacs-helpful-configuration
   (package
     (package emacs-helpful)
@@ -145,6 +153,8 @@
    (default-value (home-emacs-helpful-configuration))
    (description "Install and configure emacs-helpful.")))
 
+;;; Emacs Yasnippet Capf
+
 (define-configuration/no-serialization home-emacs-yasnippet-capf-configuration
   (package
     (package emacs-yasnippet-capf)
@@ -178,6 +188,8 @@
    (default-value (home-emacs-yasnippet-capf-configuration))
    (description "Install and configure emacs-yasnippet-capf.")))
 
+;;; Emacs Dashboard
+
 (define-configuration/no-serialization home-emacs-dashboard-configuration
   (package
     (package emacs-dashboard)
@@ -212,6 +224,7 @@
    (default-value (home-emacs-dashboard-configuration))
    (description "Install and configure emacs-dashboard.")))
 
+;;; Emacs Eros
 
 (define-configuration/no-serialization home-emacs-eros-configuration
   (package
@@ -246,13 +259,15 @@
    (default-value (home-emacs-eros-configuration))
    (description "Install and configure emacs-eros.")))
 
+;;; Emacs Ace Link
+
 (define-configuration/no-serialization home-emacs-ace-link-configuration
   (package
     (package emacs-ace-link)
     "Package to use for setting emacs-ace-link.")
   (default-key
-   (string "o")
+    (string "o")
-   "Key to use as the default keybinding.")
+    "Key to use as the default keybinding.")
   (goto-address-key
    maybe-string
    "Key to use (if any) to bind with goto-address-mode.")
@@ -303,6 +318,8 @@
    (default-value (home-emacs-ace-link-configuration))
    (description "Install and configure emacs-ace-link.")))
 
+;;; Emacs Golden Ratio
+
 (define-configuration/no-serialization home-emacs-golden-ratio-configuration
   (package
     (package emacs-golden-ratio)
@@ -339,3 +356,45 @@
    (compose identity)
    (default-value (home-emacs-golden-ratio-configuration))
    (description "Install and configure emacs-golden-ratio.")))
+
+;;; Emacs Pinentry
+
+(define-configuration/no-serialization home-emacs-pinentry-configuration
+  (package
+    (package emacs-pinentry)
+    "Package to use for setting emacs-pinentry.")
+  (auto-start?
+   (boolean #t)
+   "Should Emacs pinentry be enabled automatically?")
+  (extra-content
+   (text-config '())
+   "Extra content for emacs-pinentry configuration."))
+
+(define (add-emacs-pinentry-configuration config)
+  (home-emacs-extension
+   (configurations
+    (append
+     (list (mixed-text-file "pinentry-config"
+                            ";;;;; pinentry-config starts here.\n"
+                            (if (home-emacs-pinentry-configuration-auto-start? config)
+                                "(pinentry-start)\n"
+                                "")
+                            ";;;;; pinentry-config ends here.\n"))
+     (home-emacs-pinentry-configuration-extra-content config)))))
+
+(define (add-emacs-pinentry-packages config)
+  (list (home-emacs-pinentry-configuration-package config)))
+
+(define home-emacs-pinentry-service-type
+  (service-type
+   (name 'home-emacs-pinentry)
+   (extensions
+    (list (service-extension
+           home-emacs-service-type
+           add-emacs-pinentry-configuration)
+          (service-extension
+           home-profile-service-type
+           add-emacs-pinentry-packages)))
+   (compose identity)
+   (default-value (home-emacs-pinentry-configuration))
+   (description "Install and configure emacs-pinentry.")))

oni/packages/emacs-config.scm

@@ -13,7 +13,7 @@
   #:use-module (oni packages go))
 
 (define-public emacs-oni-config
-  (let ((commit "62ec19f8ddc1f19cfcc6399879783d788263f7c2")
+  (let ((commit "239e72e5c9160ca41c4d3837353f96b34167b095")
         (revision "0"))
     (package
       (name "emacs-oni-config")
@@ -26,7 +26,7 @@
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0j6azmfyf9vlk2n306lijk06m1ci9pm0ywllvpra37s6sn1c2l2c"))))
+          (base32 "06x80r5pms4imzvwwwzg3qz4jkglv09ibphgmwchdrh4rh6wkb5i"))))
       (build-system emacs-build-system)
       (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
       (synopsis "My Emacs configuration")

oni/packages/emacs.scm

@@ -472,3 +472,28 @@ the main focus will have the perfect size for editing, while the ones that are
 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-syncthing-status
+  (let ((commit "3d521e3929cc4e4060205b969a1a37f516758b77")
+        (revision "0"))
+    (package
+      (name "emacs-syncthing-status")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://github.com/bharadswami/syncthing-status.el.git")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0bvfnkr851ghnax9aj13dw9kmhf34734qfnkmjdzfri5dcad10ck"))))
+      (propagated-inputs
+       (list emacs-request))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/bharadswami/syncthing-status.el")
+      (synopsis "Elisp to quickly get sync status of folders and devices on Syncthing")
+      (description "Elisp to quickly get sync status of folders and devices on Syncthing. Uses the
+Syncthing REST API and request package to get this data and display it in an
+Emacs buffer.")
+      (license license:expat))))