Compare commits

..

No commits in common. "314ef89dc0d3f76291acbd55829a687cb5f17063" and "6054dccc671df8d254fb39fc08bb04466057861e" have entirely different histories.

4 changed files with 7 additions and 97 deletions

View file

@ -75,9 +75,7 @@
home-emacs-helpful-configuration
home-emacs-yasnippet-capf-service-type
home-emacs-dashboard-service-type
home-emacs-dashboard-configuration
home-emacs-eros-service-type
home-emacs-ace-link-service-type))
home-emacs-dashboard-configuration))
#:use-module ((oni home services environment)
#:select (home-environment-service))
#:use-module ((oni home services flameshot)
@ -416,8 +414,6 @@
(local-file "../services/emacs/oni-helpful.el")))))
(service home-emacs-yasnippet-capf-service-type)
(service home-emacs-dashboard-service-type)
(service home-emacs-eros-service-type)
(service home-emacs-ace-link-service-type)
(service home-flameshot-service-type)

View file

@ -9,9 +9,7 @@
#:select (emacs))
#:use-module ((gnu packages emacs-xyz)
#:select (emacs-helpful
emacs-dashboard
emacs-eros
emacs-ace-link))
emacs-dashboard))
#:use-module ((gnu home services)
#:select (service-type
service-extension
@ -27,6 +25,7 @@
mixed-text-file))
#:use-module ((guix packages)
#:select (package?))
#:use-module ((oni packages emacs)
#:select (emacs-yasnippet-capf))
@ -40,13 +39,7 @@
home-emacs-yasnippet-capf-configuration
home-emacs-dashboard-service-type
home-emacs-dashboard-configuration
home-emacs-eros-service-type
home-emacs-eros-configuration
home-emacs-ace-link-service-type
home-emacs-ace-link-configuration))
home-emacs-dashboard-configuration))
(define-configuration/no-serialization home-emacs-extension
(configurations
@ -203,70 +196,3 @@
(compose identity)
(default-value (home-emacs-dashboard-configuration))
(description "Install and configure emacs-dashboard.")))
(define-configuration/no-serialization home-emacs-eros-configuration
(package
(package emacs-eros)
"Package to use for setting emacs-eros.")
(configurations
(text-config '())
"Configuration for emacs-eros."))
(define (add-emacs-eros config)
(home-emacs-extension
(configurations
(append
(list (mixed-text-file "eros-config"
"(eros-mode)\n"))
(home-emacs-eros-configuration-configurations config)))))
(define (add-emacs-eros-packages config)
(list (home-emacs-eros-configuration-package config)))
(define home-emacs-eros-service-type
(service-type
(name 'home-emacs-eros)
(extensions
(list (service-extension
home-emacs-service-type
add-emacs-eros)
(service-extension
home-profile-service-type
add-emacs-eros-packages)))
(compose identity)
(default-value (home-emacs-eros-configuration))
(description "Install and configure emacs-eros.")))
(define-configuration/no-serialization home-emacs-ace-link-configuration
(package
(package emacs-ace-link)
"Package to use for setting emacs-ace-link.")
(configurations
(text-config '())
"Configuration for emacs-ace-link."))
(define (add-emacs-ace-link config)
(home-emacs-extension
(configurations
(append
(list (mixed-text-file "ace-link-config"
"(ace-link-setup-default)\n"))
(home-emacs-ace-link-configuration-configurations config)))))
(define (add-emacs-ace-link-packages config)
(list (home-emacs-ace-link-configuration-package config)))
(define home-emacs-ace-link-service-type
(service-type
(name 'home-emacs-ace-link)
(extensions
(list (service-extension
home-emacs-service-type
add-emacs-ace-link)
(service-extension
home-profile-service-type
add-emacs-ace-link-packages)))
(compose identity)
(default-value (home-emacs-ace-link-configuration))
(description "Install and configure emacs-ace-link.")))

View file

@ -85,20 +85,9 @@ after it has been unlocked."
(define-key m (kbd "f") "exec flameshot full")
m))
(defvar *notification-bindings*
(let ((m (make-sparse-keymap)))
(define-key m (kbd "RET") "exec dunstctl action")
(define-key m (kbd "c") "exec dunstctl close")
(define-key m (kbd "S-c") "exec dunstctl close-all")
(define-key m (kbd "SPC") "exec dunstctl context")
(define-key m (kbd ",") "exec dunstctl history-pop")
(define-key m (kbd "p") "exec dunstctl set-paused toggle")
m))
(defvar *user-bindings*
(let ((m (make-sparse-keymap)))
(define-key m (kbd "s") '*screenshot-bindings*)
(define-key m (kbd "n") '*notification-bindings*)
m))
(define-key *top-map* (kbd "s-c") '*user-bindings*)

View file

@ -13,7 +13,7 @@
#:use-module (oni packages go))
(define-public emacs-oni-config
(let ((commit "76e4f129563be48048a5f2142924aa3cebee6bb2")
(let ((commit "e6a7b37ce47422db495d647b30643b9e26c58e67")
(revision "0"))
(package
(name "emacs-oni-config")
@ -26,7 +26,7 @@
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "01f6j91wzlnbnidv2kvnm6xdcqb9qpb0a9hsa36l7jm1x94xxfwx"))))
(base32 "1qi64x699fg3nazzwch4y3ypdddppm7nsnvsjvr92ivv13p33sab"))))
(build-system emacs-build-system)
(home-page "https://code.ryuslash.org/ryuslash/emacs-config")
(synopsis "My Emacs configuration")
@ -603,8 +603,7 @@ Emacs")))
(propagated-inputs
(list emacs-oni-sendmail
emacs-notmuch
emacs-ol-notmuch
emacs-olivetti))
emacs-ol-notmuch))
(synopsis "My notmuch configuration for Emacs.")
(description "This package provides my configuration for notmuch.")))