diff options
| -rw-r--r-- | .guix-channel | 10 | ||||
| -rw-r--r-- | deployment/systems/aisaka.scm | 4 | ||||
| -rw-r--r-- | deployment/systems/akashi.scm | 11 | ||||
| -rw-r--r-- | deployment/systems/ayase.scm | 5 | ||||
| -rw-r--r-- | users/id1000.scm | 68 |
5 files changed, 49 insertions, 49 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 c5c687c..508ebad 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -18,9 +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 home) #:prefix suweren:home:) - #:use-module ((suweren system) #:prefix suweren:system:) - #:use-module ((suweren update) #:prefix suweren:update:) #:use-module ((users id1000) #:prefix users:id1000:) #:use-module ((users vmail) #:prefix users:vmail:)) @@ -193,7 +190,6 @@ (hide? #t) (path "/srv/git/marek/packages")))) (project-list (list "deployment.git" - "distribution.git" "nonguix.git" "sovereign.git")) (repository-directory "/var/lib/gitolite/repositories")))) diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index a7d48d2..dc2f65e 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -5,6 +5,7 @@ #:use-module ((gnu packages linux) #:prefix gnu:packages:linux:) #:use-module ((gnu services guix) #:prefix gnu:services:guix:) #:use-module ((gnu system) #:prefix gnu:system:) + #:use-module ((gnu system file-systems) #:prefix gnu:system:file-systems:) #:use-module ((machines thinkpad-x200) #:prefix machines:thinkpad-x200:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) #:use-module (users id1000)) @@ -21,16 +22,14 @@ "akashi") (define (file-systems) - (use-modules (suweren system)) - (append %suweren-file-systems - (list root-partition))) + (cons* root-partition + gnu:system:file-systems:%base-file-systems)) (define keyboard-layout* ((@ (gnu system keyboard) keyboard-layout) "pl")) (define (services) - (use-modules (suweren system)) (let* ((home-environments `((,uid1000-name ,uid1000-home-environment))) (guix-home ((@ (gnu services) service) gnu:services:guix:guix-home-service-type @@ -63,7 +62,7 @@ (swap-devices (machines:thinkpad-x200:swap-devices* host-name*)) (users users) (timezone timezone*) - (locale polish-locale-string) - (locale-definitions %suweren-locale-definitions) + (locale sovereign:systems:pl-locale) + (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services (services)) (sudoers-file sovereign:systems:%sovereign-sudoers-specification)))) diff --git a/deployment/systems/ayase.scm b/deployment/systems/ayase.scm index 9606c7b..933c211 100644 --- a/deployment/systems/ayase.scm +++ b/deployment/systems/ayase.scm @@ -10,7 +10,6 @@ #:use-module ((sovereign devices amd64) #:prefix sovereign:devices:amd64:) #:use-module ((sovereign packages protonmail) #:prefix sovereign:packages:protonmail:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) - #:use-module ((suweren system) #:prefix suweren:system:) #:use-module ((users id1000) #:prefix users:id1000:)) (define efi-filesystem-uuid @@ -133,7 +132,7 @@ swap-device-2)) (users (users)) (timezone "Europe/Warsaw") - (locale suweren:system:polish-locale-string) - (locale-definitions suweren:system:%suweren-locale-definitions) + (locale sovereign:systems:pl-locale) + (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services services) (sudoers-file sovereign:systems:%sovereign-sudoers-specification))) diff --git a/users/id1000.scm b/users/id1000.scm index 9d56ae0..dc2d0e6 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -5,6 +5,12 @@ #:prefix gnu:home:) #:use-module ( (gnu home services) #:prefix gnu:home:services:) + #:use-module ( (gnu home services desktop) + #:prefix gnu:home:services:desktop:) + #:use-module ( (gnu home services shepherd) + #:prefix gnu:home:services:shepherd:) + #:use-module ( (gnu home services sound) + #:prefix gnu:home:services:sound:) #:use-module ( (gnu home services shells) #:prefix gnu:home:services:shells:) #:use-module ( (gnu packages audio) @@ -21,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 home) - #:prefix suweren:home:)) + #:prefix sovereign:systems:)) (guix:records:define-record-type* <dkimproxy-out-signature-configuration> dkimproxy-out-signature-configuration @@ -544,30 +550,38 @@ (home-directory "/home/marek"))) (define-public uid1000-home-environment - (let* - ( (gitconfig-file (local-file "uid1000-gitconfig")) ; TODO modularize - (gitignore-file (local-file "uid1000-gitignore")) ; TODO review the contents - (gitconfig (list "git/config" - gitconfig-file)) - (gitignore (list "git/ignore" - gitignore-file)) - (git-configuration-files (list gitconfig - gitignore)) - (git-configuration (gnu:services:simple-service 'git-configuration - gnu:home:services:home-xdg-configuration-files-service-type - git-configuration-files)) - (user-services (list bash - sovereign:systems:bash-configuration - environment-variables - git-configuration - sovereign:services:fontutils:home-fontconfig-service-type)) - (l-services (append suweren:home:%suweren-home-services - user-services))) - (gnu:home:home-environment - (packages (cons* gnu:packages:version-control:git - gnu:packages:disk:gparted - sovereign:systems:common-home-environment-packages)) - (services l-services)))) + (let + ( (l-gitconfig-file (local-file "uid1000-gitconfig")) ; TODO modularize + (l-gitignore-file (local-file "uid1000-gitignore")) ; TODO review the contents + (l-home-dbus-service (gnu:services:service gnu:home:services:desktop:home-dbus-service-type)) + (l-home-pipewire-service (gnu:services:service gnu:home:services:sound:home-pipewire-service-type)) + (l-home-shepherd-service (gnu:services:service gnu:home:services:shepherd:home-shepherd-service-type))) + (let + ( (l-gitconfig (list "git/config" + l-gitconfig-file)) + (l-gitignore (list "git/ignore" + l-gitignore-file))) + (let* + ( (l-git-configuration-files (list l-gitconfig + l-gitignore)) + (l-git-configuration (gnu:services:simple-service 'git-configuration + gnu:home:services:home-xdg-configuration-files-service-type + l-git-configuration-files)) + (l-user-services (list bash + sovereign:systems:bash-configuration + environment-variables + l-git-configuration + sovereign:services:fontutils:home-fontconfig-service-type)) + (l-services (cons* sovereign:services:admin:update-commands + l-home-dbus-service + l-home-pipewire-service + l-home-shepherd-service + l-user-services))) + (gnu:home:home-environment + (packages (cons* gnu:packages:version-control:git + gnu:packages:disk:gparted + sovereign:systems:common-home-environment-packages)) + (services l-services)))))) (define-public name/home-environment (list uid1000-name |