From f6a1872294a4a6e2fb10e6a0ce3a4d88c435438c Mon Sep 17 00:00:00 2001 From: Luis Guilherme Coelho Date: Tue, 26 Nov 2024 14:53:35 -0300 Subject: [PATCH] zero: Make (radio *) and (buer *) into proper (home-environments radio) and (operating-systems buer) submodules --- home-environments/radio/channels.scm | 15 +++++++++++++-- home-environments/radio/mime-types.scm | 2 +- home-environments/radio/packages.scm | 2 +- home-environments/radio/shepherd-services.scm | 2 +- operating-systems/buer/build-machines.scm | 2 +- operating-systems/buer/channels.scm | 15 +++++++++++++-- operating-systems/buer/file-systems.scm | 2 +- operating-systems/buer/files.scm | 2 +- operating-systems/buer/kernel.scm | 2 +- operating-systems/buer/privilege.scm | 2 +- operating-systems/buer/rules.scm | 2 +- operating-systems/buer/secrets.scm | 2 +- operating-systems/buer/shepherd-services.scm | 2 +- operating-systems/buer/ssh-keys.scm | 2 +- operating-systems/buer/substitute-keys.scm | 2 +- operating-systems/buer/users.scm | 2 +- 16 files changed, 40 insertions(+), 18 deletions(-) diff --git a/home-environments/radio/channels.scm b/home-environments/radio/channels.scm index 76cb809..a42ad9a 100644 --- a/home-environments/radio/channels.scm +++ b/home-environments/radio/channels.scm @@ -1,8 +1,8 @@ -(define-module (radio channels) +(define-module (home-environments radio channels) #:use-module (guix channels) #:use-module (gnu packages package-management) - #:export (guix radix saayix)) + #:export (guix radix saayix shepherd)) (define guix (channel @@ -36,3 +36,14 @@ "12540f593092e9a177eb8a974a57bb4892327752" (openpgp-fingerprint "3FFA 7335 973E 0A49 47FC 0A8C 38D5 96BE 07D3 34AB"))))) + +(define shepherd + (channel + (name 'shepherd) + (url "https://git.savannah.gnu.org/git/shepherd.git") + (branch "main") + (introduction + (make-channel-introduction + "788a6d6f1d5c170db68aa4bbfb77024fdc468ed3" + (openpgp-fingerprint + "3CE464558A84FDC69DB40CFB090B11993D9AEBB5"))))) diff --git a/home-environments/radio/mime-types.scm b/home-environments/radio/mime-types.scm index 603ef3d..fd881a3 100644 --- a/home-environments/radio/mime-types.scm +++ b/home-environments/radio/mime-types.scm @@ -1,4 +1,4 @@ -(define-module (radio mime-types) +(define-module (home-environments radio mime-types) #:export (browser editor file-manager audio video image document)) (define browser diff --git a/home-environments/radio/packages.scm b/home-environments/radio/packages.scm index 8d39796..e101837 100644 --- a/home-environments/radio/packages.scm +++ b/home-environments/radio/packages.scm @@ -1,4 +1,4 @@ -(define-module (radio packages) +(define-module (home-environments radio packages) #|GNU packages|# #|A|# #:use-module (gnu packages admin) #|B|# #:use-module (gnu packages bittorrent) diff --git a/home-environments/radio/shepherd-services.scm b/home-environments/radio/shepherd-services.scm index d52911b..1113016 100644 --- a/home-environments/radio/shepherd-services.scm +++ b/home-environments/radio/shepherd-services.scm @@ -1,4 +1,4 @@ -(define-module (radio shepherd-services) +(define-module (home-environments radio shepherd-services) #:use-module (guix gexp) #:use-module (gnu services shepherd) #:use-module (shepherd service timer) diff --git a/operating-systems/buer/build-machines.scm b/operating-systems/buer/build-machines.scm index 895e24f..647d2f1 100644 --- a/operating-systems/buer/build-machines.scm +++ b/operating-systems/buer/build-machines.scm @@ -1,4 +1,4 @@ -(define-module (buer build-machines) +(define-module (operating-systems buer build-machines) #:use-module ((buer ssh-keys) #:prefix ssh-key:) #:use-module (guix gexp) diff --git a/operating-systems/buer/channels.scm b/operating-systems/buer/channels.scm index 159a843..8d960ac 100644 --- a/operating-systems/buer/channels.scm +++ b/operating-systems/buer/channels.scm @@ -1,8 +1,8 @@ -(define-module (buer channels) +(define-module (operating-systems buer channels) #:use-module (guix channels) #:use-module (gnu packages package-management) - #:export (guix radix)) + #:export (guix radix shepherd)) (define guix (channel @@ -25,3 +25,14 @@ "f9130e11e35d2c147c6764ef85542dc58dc09c4f" (openpgp-fingerprint "F164 709E 5FC7 B32B AEC7 9F37 1F2E 76AC E3F5 31C8"))))) + +(define shepherd + (channel + (name 'shepherd) + (url "https://git.savannah.gnu.org/git/shepherd.git") + (branch "main") + (introduction + (make-channel-introduction + "788a6d6f1d5c170db68aa4bbfb77024fdc468ed3" + (openpgp-fingerprint + "3CE464558A84FDC69DB40CFB090B11993D9AEBB5"))))) diff --git a/operating-systems/buer/file-systems.scm b/operating-systems/buer/file-systems.scm index ce1ca93..8781416 100644 --- a/operating-systems/buer/file-systems.scm +++ b/operating-systems/buer/file-systems.scm @@ -1,4 +1,4 @@ -(define-module (buer file-systems) +(define-module (operating-systems buer file-systems) #:use-module (gnu system file-systems) #:export (partition:guix diff --git a/operating-systems/buer/files.scm b/operating-systems/buer/files.scm index 805d1b7..22bb1ed 100644 --- a/operating-systems/buer/files.scm +++ b/operating-systems/buer/files.scm @@ -1,4 +1,4 @@ -(define-module (buer files) +(define-module (operating-systems buer files) #:use-module (gnu) #:export (thinkfan-config)) diff --git a/operating-systems/buer/kernel.scm b/operating-systems/buer/kernel.scm index 4fc3e61..1842eb7 100644 --- a/operating-systems/buer/kernel.scm +++ b/operating-systems/buer/kernel.scm @@ -1,4 +1,4 @@ -(define-module (buer kernel) +(define-module (operating-systems buer kernel) #:use-module (guix gexp) #:use-module (gnu packages linux)) diff --git a/operating-systems/buer/privilege.scm b/operating-systems/buer/privilege.scm index 99203f5..2d152d9 100644 --- a/operating-systems/buer/privilege.scm +++ b/operating-systems/buer/privilege.scm @@ -1,4 +1,4 @@ -(define-module (buer privilege) +(define-module (operating-systems buer privilege) #:use-module (gnu packages admin) #:use-module (gnu packages linux) #:use-module (gnu system privilege) diff --git a/operating-systems/buer/rules.scm b/operating-systems/buer/rules.scm index 8d4d298..66b54a9 100644 --- a/operating-systems/buer/rules.scm +++ b/operating-systems/buer/rules.scm @@ -1,4 +1,4 @@ -(define-module (buer rules) +(define-module (operating-systems buer rules) #:use-module (radix services admin) #:use-module (radix utils) #:export (general diff --git a/operating-systems/buer/secrets.scm b/operating-systems/buer/secrets.scm index 71ca214..edc0bcd 100644 --- a/operating-systems/buer/secrets.scm +++ b/operating-systems/buer/secrets.scm @@ -1,4 +1,4 @@ -(define-module (buer secrets) +(define-module (operating-systems buer secrets) #:use-module (gnu) #:export (%radio-password %root-password)) diff --git a/operating-systems/buer/shepherd-services.scm b/operating-systems/buer/shepherd-services.scm index c19272b..a624d10 100644 --- a/operating-systems/buer/shepherd-services.scm +++ b/operating-systems/buer/shepherd-services.scm @@ -1,4 +1,4 @@ -(define-module (buer shepherd-services) +(define-module (operating-systems buer shepherd-services) #:use-module (guix gexp) #:use-module (gnu services shepherd) #:use-module (shepherd service repl) diff --git a/operating-systems/buer/ssh-keys.scm b/operating-systems/buer/ssh-keys.scm index 96a2424..4adcaf7 100644 --- a/operating-systems/buer/ssh-keys.scm +++ b/operating-systems/buer/ssh-keys.scm @@ -1,4 +1,4 @@ -(define-module (buer ssh-keys) +(define-module (operating-systems buer ssh-keys) #:use-module (gnu) #:export (yumiko.pub)) diff --git a/operating-systems/buer/substitute-keys.scm b/operating-systems/buer/substitute-keys.scm index ca81461..57f49a6 100644 --- a/operating-systems/buer/substitute-keys.scm +++ b/operating-systems/buer/substitute-keys.scm @@ -1,4 +1,4 @@ -(define-module (buer substitute-keys) +(define-module (operating-systems buer substitute-keys) #:use-module (gnu) #:export (berlin.pub genenetwork.pub diff --git a/operating-systems/buer/users.scm b/operating-systems/buer/users.scm index 6f0da24..3577184 100644 --- a/operating-systems/buer/users.scm +++ b/operating-systems/buer/users.scm @@ -1,4 +1,4 @@ -(define-module (buer users) +(define-module (operating-systems buer users) #:use-module (buer secrets) #:use-module (gnu packages bash) #:use-module (gnu packages shells)