aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2026-01-18 01:04:46 -0800
committerGravatar Tom Willemse2026-01-18 01:07:32 -0800
commitd4410d894949f56c4b01dbf3087be4896251f94c (patch)
treeebe2ce1167a963fe49fbc8b9bcb3a314fe705b26
parent3ca6f519c9dfd164c06e45f404490b287d0b501c (diff)
downloadnew-dotfiles-d4410d894949f56c4b01dbf3087be4896251f94c.tar.gz
new-dotfiles-d4410d894949f56c4b01dbf3087be4896251f94c.zip
rincewind: Fix abcde
-rw-r--r--oni/home/config/common.scm1
-rw-r--r--oni/home/config/rincewind.scm25
2 files changed, 19 insertions, 7 deletions
diff --git a/oni/home/config/common.scm b/oni/home/config/common.scm
index 3593a11..3d12d40 100644
--- a/oni/home/config/common.scm
+++ b/oni/home/config/common.scm
@@ -255,7 +255,6 @@ LocalForward 19999 localhost:19999"))
"alias sbcl=\"rlwrap sbcl\"\n"
"alias hc=herbstclient\n"
"alias reco=\"pushd ~/projects/new-dotfiles/ && guix home reconfigure config.scm; popd\"\n"
- "alias abcde=\"guix shell abcde -- abcde\"\n"
"setopt SHARE_HISTORY\n"
"setopt HIST_IGNORE_ALL_DUPS\n"
"setopt HIST_IGNORE_SPACE\n"
diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 1f9a9b3..e4e96aa 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -34,8 +34,8 @@
#:use-module ((gnu packages mail)
#:select (notmuch
emacs-notmuch))
- #:use-module ((gnu packages music)
- #:select (easytag))
+ #:use-module (gnu packages music)
+ #:use-module (gnu packages perl-web)
#:use-module ((gnu packages tree-sitter)
#:select (tree-sitter-bash
tree-sitter-scheme
@@ -43,6 +43,7 @@
tree-sitter-org
tree-sitter-json
tree-sitter-css))
+ #:use-module (gnu packages web)
#:use-module ((gnu packages)
#:select (specification->package+output
specification->package))
@@ -56,9 +57,7 @@
#:use-module ((guix gexp)
#:select (local-file
mixed-text-file))
- #:use-module ((guix packages)
- #:select (package-name
- package-input-rewriting))
+ #:use-module (guix packages)
#:use-module ((guix transformations)
#:select (options->transformation))
#:use-module ((nongnu packages emacs)
@@ -203,6 +202,18 @@
`((with-branch . ,(string-append (package-name package) "=master"))))
package))
+(define my-perl-webservice-musicbrainz
+ (package
+ (inherit perl-webservice-musicbrainz)
+ (propagated-inputs
+ (list perl-mojolicious
+ perl-io-socket-ssl))))
+
+(define fixed-abcde
+ ((package-input-rewriting
+ `((,perl-webservice-musicbrainz . ,my-perl-webservice-musicbrainz)))
+ abcde))
+
(define rincewind-picom-service
(service home-picom-service-type
(home-picom-configuration
@@ -335,7 +346,9 @@
emacs-indexed
emacs-gnuplot
- emacs-phel-mode)))
+ emacs-phel-mode
+
+ fixed-abcde)))
(services
(append