Move .pubkeys into .guix channel dir

Following the update in dotfiles@f0e8fd16c0f2a1f7aa02f3e3fed02dea163ed540 where the guix channel was
updated to guix@9d75215a59629ab224154ef6b843043289291f81, but the guix daemon hadn't been
restarted since guix@703ae431f4ad28658e34675310b4fdf58685ccdd, something changed with how
channel path/s are resolved when using ~local-file~, resulting in an error like this:

guix system: error: canonicalize-path: No such file or directory:
"/gnu/store/bvcj18amwyb6lq22grvxyb06vwgh8mqy-rekahsoft-dotfiles/share/guile/site/3.0/rekahsoft/guix-config/../../../.pubkeys/rsa2048-ED51AB07.pub"

This commit resolves this issue.
This commit is contained in:
Collin J. Doering 2024-10-26 10:44:17 -04:00
parent 42d0c61105
commit 4f50fb8898
Signed by: rekahsoft
GPG Key ID: F77E319397CDA716
8 changed files with 9 additions and 9 deletions

View File

@ -23,14 +23,14 @@
(define %guix-signing-keys (define %guix-signing-keys
(list (list
(local-file "../../../.pubkeys/guix/cuirass-genenetwork-org.pub") (local-file "../../.pubkeys/guix/cuirass-genenetwork-org.pub")
(local-file "../../../.pubkeys/guix/cuirass-nonguix-org.pub") (local-file "../../.pubkeys/guix/cuirass-nonguix-org.pub")
(local-file "../../../.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub"))) (local-file "../../.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub")))
;; Keys used for ssh access ;; Keys used for ssh access
(define collin-ed25519-key (local-file "../../../.pubkeys/ssh/ed25519-861CD08E.pub")) (define collin-ed25519-key (local-file "../../.pubkeys/ssh/ed25519-861CD08E.pub"))
(define collin-rsa4096-key (local-file "../../../.pubkeys/ssh/rsa4096-6765FB18.pub")) (define collin-rsa4096-key (local-file "../../.pubkeys/ssh/rsa4096-6765FB18.pub"))
(define collin-rsa-key (local-file "../../../.pubkeys/ssh/rsa2048-ED51AB07.pub")) (define collin-rsa-key (local-file "../../.pubkeys/ssh/rsa2048-ED51AB07.pub"))
(define %rkd-desktop-services (define %rkd-desktop-services
(append (append

View File

@ -496,9 +496,9 @@ single certifcate used for local development with caddy.")
(".guile" ,(local-file "../../../user-config/guile/.guile" "guilerc")) (".guile" ,(local-file "../../../user-config/guile/.guile" "guilerc"))
(".ghci" ,(local-file "../../../user-config/haskell/.ghci" "ghci")) (".ghci" ,(local-file "../../../user-config/haskell/.ghci" "ghci"))
(".ssh/id_ed25519.pub" ,(local-file "../../../.pubkeys/ed25519-861CD08E.pub" "id_ed25519.pub")) (".ssh/id_ed25519.pub" ,(local-file "../../.pubkeys/ssh/ed25519-861CD08E.pub" "id_ed25519.pub"))
(".ssh/id_rsa4096.pub" ,(local-file "../../../.pubkeys/rsa4096-6765FB18.pub" "id_rsa4096.pub")) (".ssh/id_rsa4096.pub" ,(local-file "../../.pubkeys/ssh/rsa4096-6765FB18.pub" "id_rsa4096.pub"))
(".ssh/id_rsa.pub" ,(local-file "../../../.pubkeys/rsa2048-ED51AB07.pub" "id_rsa.pub")) (".ssh/id_rsa.pub" ,(local-file "../../.pubkeys/ssh/rsa2048-ED51AB07.pub" "id_rsa.pub"))
(".gnupg/gpg.conf" ,(local-file "../../../user-config/gnupg/gpg.conf" "gpg.conf")) (".gnupg/gpg.conf" ,(local-file "../../../user-config/gnupg/gpg.conf" "gpg.conf"))
(".bin/emacs-mail.sh" ,(local-file "../../../user-config/emacs/.bin/emacs-mail.sh" "emacs-mail.sh" #:recursive? #t)) (".bin/emacs-mail.sh" ,(local-file "../../../user-config/emacs/.bin/emacs-mail.sh" "emacs-mail.sh" #:recursive? #t))