ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: ryuslash:4bfcc5f2cd2f54247bf3893891f00af93c3b20c5
Branches Tags
ryuslash:master
..
compare: ryuslash:314ef89dc0d3f76291acbd55829a687cb5f17063
Branches Tags
ryuslash:master

No commits in common. "4bfcc5f2cd2f54247bf3893891f00af93c3b20c5" and "314ef89dc0d3f76291acbd55829a687cb5f17063" have entirely different histories.
4bfcc5f2cd ... 314ef89dc0

4 changed files with 11 additions and 80 deletions
Show stats Expand all files Collapse all files

21
oni/home/config/rincewind.scm
View file

@ -53,8 +53,7 @@
#:select (local-file
mixed-text-file))
#:use-module ((guix packages)
#:select (package-name
package-input-rewriting))
#:select (package-name))
#:use-module ((guix transformations)
#:select (options->transformation))
#:use-module ((nongnu packages emacs)
@ -78,8 +77,7 @@
home-emacs-dashboard-service-type
home-emacs-dashboard-configuration
home-emacs-eros-service-type
home-emacs-ace-link-service-type
home-emacs-ace-link-configuration))
home-emacs-ace-link-service-type))
#:use-module ((oni home services environment)
#:select (home-environment-service))
#:use-module ((oni home services flameshot)
@ -121,8 +119,7 @@
#:use-module ((oni packages count-emails)
#:select (count-emails))
#:use-module ((oni packages emacs)
#:select (emacs-inkplate
oni-emacs-notmuch))
#:select (emacs-inkplate))
#:use-module ((oni packages emacs-config)
#:select (emacs-oni-org-roam
emacs-oni-vterm
@ -198,9 +195,6 @@
`((with-branch . ,(string-append (package-name package) "=master"))))
package))
(define with-my-emacs-notmuch-package
(package-input-rewriting `((,emacs-notmuch . ,oni-emacs-notmuch))))
(define rincewind-picom-service
(service home-picom-service-type
(home-picom-configuration
@ -268,6 +262,7 @@
tmsu
mpd-random-albums
notmuch
emacs-notmuch
emacs-inkplate
emacs-outli
emacs-guix
@ -282,7 +277,7 @@
emacs-oni-common-lisp
emacs-oni-gui
emacs-oni-magit
(with-my-emacs-notmuch-package emacs-oni-notmuch)
emacs-oni-notmuch
emacs-oni-hy
emacs-oni-project
emacs-oni-bookmark
@ -422,11 +417,7 @@
(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
(home-emacs-ace-link-configuration
(default-key "C-S-e")
(goto-address-key "C-S-e")
(org-mode-key "C-S-e")))
(service home-emacs-ace-link-service-type)
(service home-flameshot-service-type)

32
oni/home/services/emacs.scm
View file

@ -4,9 +4,7 @@
define-configuration
define-configuration/no-serialization
text-config?
serialize-text-config
define-maybe
maybe-value-set?))
serialize-text-config))
#:use-module ((gnu packages emacs)
#:select (emacs))
#:use-module ((gnu packages emacs-xyz)
@ -50,8 +48,6 @@
home-emacs-ace-link-service-type
home-emacs-ace-link-configuration))
(define-maybe string)
(define-configuration/no-serialization home-emacs-extension
(configurations
(text-config '())
@ -246,15 +242,6 @@
(package
(package emacs-ace-link)
"Package to use for setting emacs-ace-link.")
(default-key
(string "o")
"Key to use as the default keybinding.")
(goto-address-key
maybe-string
"Key to use (if any) to bind with goto-address-mode.")
(org-mode-key
maybe-string
"Key to use (if any) to bind with org-mode.")
(configurations
(text-config '())
"Configuration for emacs-ace-link."))
@ -264,22 +251,7 @@
(configurations
(append
(list (mixed-text-file "ace-link-config"
";;;;; ace-link-config starts here.\n"
(format #f "(ace-link-setup-default (kbd ~s))~%"
(home-emacs-ace-link-configuration-default-key config))
(let ((goto-address-key
(home-emacs-ace-link-configuration-goto-address-key config)))
(if (maybe-value-set? goto-address-key)
(string-append (format #f "(defun ace-link-config-set-goto-address-key () (local-set-key (kbd ~s) 'ace-link-addr))~%" goto-address-key)
"(add-hook 'goto-address-prog-mode-hook #'ace-link-config-set-goto-address-key)\n"
"(add-hook 'goto-address-mode-hook #'ace-link-config-set-goto-address-key)\n")
""))
(let ((org-mode-key
(home-emacs-ace-link-configuration-org-mode-key config)))
(if (maybe-value-set? org-mode-key)
(format #f "(with-eval-after-load 'org (define-key org-mode-map (kbd ~s) 'ace-link-org))\n" org-mode-key)
""))
";;;;; ace-link-config ends here.\n"))
"(ace-link-setup-default)\n"))
(home-emacs-ace-link-configuration-configurations config)))))
(define (add-emacs-ace-link-packages config)

4
oni/packages/emacs-config.scm
View file

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

34
oni/packages/emacs.scm
View file

@ -2,14 +2,10 @@
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
#:use-module ((guix gexp)
#:select (gexp))
#: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 mail)
#:select (notmuch)))
#:use-module (gnu packages emacs-xyz))
(define-public emacs-inkplate
(let ((commit "0897721a7b3d84aa3f200ae85fddd5fdd370fc42")
@ -416,31 +412,3 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
(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.")))