Compare commits

..

No commits in common. "c33a58467a5a6e81ea5cb882871ae11384eb1513" and "c36b17fa7a034f0f653680f1d4a1467b6babe0c5" have entirely different histories.

5 changed files with 10 additions and 107 deletions

View file

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

View file

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

View file

@ -13,8 +13,7 @@
#:select (emacs-helpful #:select (emacs-helpful
emacs-dashboard emacs-dashboard
emacs-eros emacs-eros
emacs-ace-link emacs-ace-link))
emacs-pinentry))
#:use-module ((gnu home services) #:use-module ((gnu home services)
#:select (service-type #:select (service-type
service-extension service-extension
@ -53,15 +52,10 @@
home-emacs-ace-link-configuration home-emacs-ace-link-configuration
home-emacs-golden-ratio-service-type 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) (define-maybe string)
;;; Emacs
(define-configuration/no-serialization home-emacs-extension (define-configuration/no-serialization home-emacs-extension
(configurations (configurations
(text-config '()) (text-config '())
@ -122,8 +116,6 @@
(default-value (home-emacs-configuration)) (default-value (home-emacs-configuration))
(description "Install and configure Emacs."))) (description "Install and configure Emacs.")))
;;; Emacs Helpful
(define-configuration/no-serialization home-emacs-helpful-configuration (define-configuration/no-serialization home-emacs-helpful-configuration
(package (package
(package emacs-helpful) (package emacs-helpful)
@ -153,8 +145,6 @@
(default-value (home-emacs-helpful-configuration)) (default-value (home-emacs-helpful-configuration))
(description "Install and configure emacs-helpful."))) (description "Install and configure emacs-helpful.")))
;;; Emacs Yasnippet Capf
(define-configuration/no-serialization home-emacs-yasnippet-capf-configuration (define-configuration/no-serialization home-emacs-yasnippet-capf-configuration
(package (package
(package emacs-yasnippet-capf) (package emacs-yasnippet-capf)
@ -188,8 +178,6 @@
(default-value (home-emacs-yasnippet-capf-configuration)) (default-value (home-emacs-yasnippet-capf-configuration))
(description "Install and configure emacs-yasnippet-capf."))) (description "Install and configure emacs-yasnippet-capf.")))
;;; Emacs Dashboard
(define-configuration/no-serialization home-emacs-dashboard-configuration (define-configuration/no-serialization home-emacs-dashboard-configuration
(package (package
(package emacs-dashboard) (package emacs-dashboard)
@ -224,7 +212,6 @@
(default-value (home-emacs-dashboard-configuration)) (default-value (home-emacs-dashboard-configuration))
(description "Install and configure emacs-dashboard."))) (description "Install and configure emacs-dashboard.")))
;;; Emacs Eros
(define-configuration/no-serialization home-emacs-eros-configuration (define-configuration/no-serialization home-emacs-eros-configuration
(package (package
@ -259,15 +246,13 @@
(default-value (home-emacs-eros-configuration)) (default-value (home-emacs-eros-configuration))
(description "Install and configure emacs-eros."))) (description "Install and configure emacs-eros.")))
;;; Emacs Ace Link
(define-configuration/no-serialization home-emacs-ace-link-configuration (define-configuration/no-serialization home-emacs-ace-link-configuration
(package (package
(package emacs-ace-link) (package emacs-ace-link)
"Package to use for setting emacs-ace-link.") "Package to use for setting emacs-ace-link.")
(default-key (default-key
(string "o") (string "o")
"Key to use as the default keybinding.") "Key to use as the default keybinding.")
(goto-address-key (goto-address-key
maybe-string maybe-string
"Key to use (if any) to bind with goto-address-mode.") "Key to use (if any) to bind with goto-address-mode.")
@ -318,8 +303,6 @@
(default-value (home-emacs-ace-link-configuration)) (default-value (home-emacs-ace-link-configuration))
(description "Install and configure emacs-ace-link."))) (description "Install and configure emacs-ace-link.")))
;;; Emacs Golden Ratio
(define-configuration/no-serialization home-emacs-golden-ratio-configuration (define-configuration/no-serialization home-emacs-golden-ratio-configuration
(package (package
(package emacs-golden-ratio) (package emacs-golden-ratio)
@ -356,45 +339,3 @@
(compose identity) (compose identity)
(default-value (home-emacs-golden-ratio-configuration)) (default-value (home-emacs-golden-ratio-configuration))
(description "Install and configure emacs-golden-ratio."))) (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.")))

View file

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

View file

@ -472,28 +472,3 @@ 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 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.") the way, but at the same time will be readable enough to know it's content.")
(license license:expat)))) (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))))