diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2025-07-24 14:31:45 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2025-07-24 14:40:29 +0200 |
| commit | 267f62d01512e4b46eac865dd0f55a6c917f9d29 (patch) | |
| tree | e294c2b5b2ea78412871f304e066cc046f1314c0 | |
| parent | 7ade7e29ba1dc1585398db801812126818319549 (diff) | |
delete remaining bindings to Distribution channel
This removal is part of a process to decomission Distribution channel.
---
The ultimate goal is to move useful code from Distribution channel to either Sovereign or Deployment channel.
Everything else will be deleted and ultimately will be removed from network.
---
Module (deployment systems aisaka) has a dangling import of (suweren update).
Module (deployment users id1000) uses update-commands from (suweren update).
Guix-channel file includes dependency on Distribution channel.
---
The dangling import of (suweren update) is deleted from (deployment systems aisaka).
The update-commands binding is replaced with a definition from Sovereign channel.
The dependency on Distribution channel is removed from the list.
---
With this change Deployment channel is completely independent of Distribution, which can be deleted now.
| -rw-r--r-- | .guix-channel | 10 | ||||
| -rw-r--r-- | deployment/systems/aisaka.scm | 1 | ||||
| -rw-r--r-- | users/id1000.scm | 8 |
3 files changed, 5 insertions, 14 deletions
diff --git a/.guix-channel b/.guix-channel index 5d8f716..7af7e9a 100644 --- a/.guix-channel +++ b/.guix-channel @@ -16,12 +16,4 @@ (commit "44a44b4c3c645a878ab8920bf0d250541bf59af0") (signer "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F"))) (name sovereign) - (url "https://git.marekpasnikowski.pl/git/sovereign.git")) - (channel - (introduction - (channel-introduction - (version 0) - (commit "7d17bded11ef1239592e6e5abd40ceee1e99cbb8") - (signer "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F"))) - (name distribution) - (url "https://git.marekpasnikowski.pl/git/distribution.git")))) + (url "https://git.marekpasnikowski.pl/git/sovereign.git")))) diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index e5b9f1a..8146a3f 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -18,7 +18,6 @@ #:use-module ((sovereign devices amd64) #:prefix sovereign:devices:amd64:) #:use-module ((sovereign packages jekyll) #:prefix sovereign:packages:jekyll:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) - #:use-module ((suweren update) #:prefix suweren:update:) #:use-module ((users id1000) #:prefix users:id1000:) #:use-module ((users vmail) #:prefix users:vmail:)) diff --git a/users/id1000.scm b/users/id1000.scm index d299b19..dc2d0e6 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -27,12 +27,12 @@ #:prefix gnu:system:accounts:) #:use-module ( (guix records) #:prefix guix:records:) + #:use-module ( (sovereign services admin) + #:prefix sovereign:services:admin:) #:use-module ( (sovereign services fontutils) #:prefix sovereign:services:fontutils:) #:use-module ( (sovereign systems) - #:prefix sovereign:systems:) - #:use-module ( (suweren update) - #:prefix suweren:update:)) + #:prefix sovereign:systems:)) (guix:records:define-record-type* <dkimproxy-out-signature-configuration> dkimproxy-out-signature-configuration @@ -572,7 +572,7 @@ environment-variables l-git-configuration sovereign:services:fontutils:home-fontconfig-service-type)) - (l-services (cons* suweren:update:update-commands + (l-services (cons* sovereign:services:admin:update-commands l-home-dbus-service l-home-pipewire-service l-home-shepherd-service |