From c013b9219623a2dc8e79588cc7270e571fc9b25e Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Mon, 20 Apr 2026 23:00:42 +0200 Subject: rename (deployment keys) module to (deployment gexp) --- deployment/gexp.scm | 33 +++++++++++++++++++++++++++++++++ deployment/keys.scm | 33 --------------------------------- deployment/system/aisaka.scm | 8 ++++---- deployment/system/akashi.scm | 6 +++--- deployment/system/mcdowell.scm | 6 +++--- deployment/system/rakan.scm | 6 +++--- 6 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 deployment/gexp.scm delete mode 100644 deployment/keys.scm diff --git a/deployment/gexp.scm b/deployment/gexp.scm new file mode 100644 index 0000000..90f62e1 --- /dev/null +++ b/deployment/gexp.scm @@ -0,0 +1,33 @@ +;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; SPDX-FileCopyrightText: 2025 Marek Paśnikowski + +(define-module (deployment gexp) + #:use-module (guix gexp)) + +(define-public aisaka-guix-key + (mixed-text-file "aisaka-guix-key.pub" + "(public-key\n" + " (ecc\n" + " (curve Ed25519)\n" + " (q #983CD313090D2699AD26AE5CB589A29F24A32E247A41EB4F4A22D196DFCD9D3C#)))")) + +(define-public akashi-guix-key + (mixed-text-file "akashi-guix-key.pub" + "(public-key\n" + " (ecc\n" + " (curve Ed25519)\n" + " (q #A3E347D0D79D616C4379C844C1D67DFC9BFD4F2011D4070EB3DB7EFA66D6F3D2#)))")) + +(define-public mcdowell-guix-key + (mixed-text-file "mcdowell-guix-key.pub" + "(public-key\n" + " (ecc\n" + " (curve Ed25519)\n" + " (q #FDA720ED167E05AB735182D887A450DCD534A85F2697DE421E49CA043FC01E4D#)))")) + +(define-public rakan-guix-key + (mixed-text-file "rakan-guix-key.pub" + "(public-key\n" + " (ecc\n" + " (curve Ed25519)\n" + " (q #FDA720ED167E05AB735182D887A450DCD534A85F2697DE421E49CA043FC01E4D#)))")) diff --git a/deployment/keys.scm b/deployment/keys.scm deleted file mode 100644 index 81dee8f..0000000 --- a/deployment/keys.scm +++ /dev/null @@ -1,33 +0,0 @@ -;;; SPDX-License-Identifier: GPL-3.0-or-later -;;; SPDX-FileCopyrightText: 2025 Marek Paśnikowski - -(define-module (deployment keys) - #:use-module (guix gexp)) - -(define-public aisaka-guix-key - (mixed-text-file "aisaka-guix-key.pub" - "(public-key\n" - " (ecc\n" - " (curve Ed25519)\n" - " (q #983CD313090D2699AD26AE5CB589A29F24A32E247A41EB4F4A22D196DFCD9D3C#)))")) - -(define-public akashi-guix-key - (mixed-text-file "akashi-guix-key.pub" - "(public-key\n" - " (ecc\n" - " (curve Ed25519)\n" - " (q #A3E347D0D79D616C4379C844C1D67DFC9BFD4F2011D4070EB3DB7EFA66D6F3D2#)))")) - -(define-public mcdowell-guix-key - (mixed-text-file "mcdowell-guix-key.pub" - "(public-key\n" - " (ecc\n" - " (curve Ed25519)\n" - " (q #FDA720ED167E05AB735182D887A450DCD534A85F2697DE421E49CA043FC01E4D#)))")) - -(define-public rakan-guix-key - (mixed-text-file "rakan-guix-key.pub" - "(public-key\n" - " (ecc\n" - " (curve Ed25519)\n" - " (q #FDA720ED167E05AB735182D887A450DCD534A85F2697DE421E49CA043FC01E4D#)))")) diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index 2b15422..d8c5e35 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -3,8 +3,8 @@ (define-module (deployment system aisaka) #:use-module (guix gexp) - #:use-module ((deployment keys) - #:prefix deployment:keys:) + #:use-module ((deployment gexp) + #:prefix deployment:gexp:) #:use-module ((gnu bootloader) #:prefix gnu:bootloader:) #:use-module ((gnu bootloader grub) @@ -539,8 +539,8 @@ (define guix-offload-rakan (gnu:services:base:guix-extension - (authorized-keys (list deployment:keys:akashi-guix-key - deployment:keys:rakan-guix-key)) + (authorized-keys (list deployment:gexp:akashi-guix-key + deployment:gexp:rakan-guix-key)) (build-machines (list rakan-machine)))) (define-public offload-rakan diff --git a/deployment/system/akashi.scm b/deployment/system/akashi.scm index c474ca7..47ff63d 100644 --- a/deployment/system/akashi.scm +++ b/deployment/system/akashi.scm @@ -4,8 +4,8 @@ (define-module (deployment system akashi) #:use-module (guix gexp) #:use-module (users id1000) - #:use-module ((deployment keys) - #:prefix deployment:keys:) + #:use-module ((deployment gexp) + #:prefix deployment:gexp:) #:use-module ((gnu packages linux) #:prefix gnu:packages:linux:) #:use-module ((gnu services) @@ -64,7 +64,7 @@ (define guix-offload-targets (gnu:services:base:guix-extension - (authorized-keys (list deployment:keys:aisaka-guix-key)) + (authorized-keys (list deployment:gexp:aisaka-guix-key)) (build-machines (list offload-hub)))) (define offload-extension diff --git a/deployment/system/mcdowell.scm b/deployment/system/mcdowell.scm index 6de9250..03b79b2 100644 --- a/deployment/system/mcdowell.scm +++ b/deployment/system/mcdowell.scm @@ -2,8 +2,8 @@ ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski (define-module (deployment system mcdowell) - #:use-module ( (deployment keys) - #:prefix deployment:keys:) + #:use-module ( (deployment gexp) + #:prefix deployment:gexp:) #:use-module ( (gnu packages package-management) #:prefix gnu:packages:package-management:) #:use-module ( (gnu services) @@ -76,7 +76,7 @@ (define guix-offload-rakan (gnu:services:base:guix-extension - (authorized-keys (list deployment:keys:rakan-guix-key)) + (authorized-keys (list deployment:gexp:rakan-guix-key)) (build-machines (list rakan-machine)))) (define-public system diff --git a/deployment/system/rakan.scm b/deployment/system/rakan.scm index 7d5863c..f857864 100644 --- a/deployment/system/rakan.scm +++ b/deployment/system/rakan.scm @@ -3,8 +3,8 @@ (define-module (deployment system rakan) #:use-module (guix gexp) - #:use-module ( (deployment keys) - #:prefix deployment:keys:) + #:use-module ( (deployment gexp) + #:prefix deployment:gexp:) #:use-module ( (deployment services databases) #:prefix deployment:services:databases:) #:use-module ( (deployment services matrix) @@ -89,7 +89,7 @@ (define guix-offload-authorizations (gnu:services:base:guix-extension - (authorized-keys (list deployment:keys:aisaka-guix-key)))) + (authorized-keys (list deployment:gexp:aisaka-guix-key)))) (define (l2md-maildir name) (string-append "~/Publiczne/l2md/" -- cgit v1.3