diff options
| -rw-r--r-- | deployment/systems/aisaka.scm | 1 | ||||
| -rw-r--r-- | deployment/systems/akashi.scm | 19 | ||||
| -rw-r--r-- | users/id1000.scm | 66 |
3 files changed, 41 insertions, 45 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index c5c687c..e77f6c8 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 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:) diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index fba424b..a7d48d2 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -3,12 +3,9 @@ (define-module (deployment systems akashi) #:use-module ((gnu packages linux) #:prefix gnu:packages:linux:) - #:use-module ((gnu services) #:prefix gnu:services:) - #:use-module ((gnu services base) #:prefix gnu:services:base:) #:use-module ((gnu services guix) #:prefix gnu:services:guix:) #:use-module ((gnu system) #:prefix gnu:system:) #:use-module ((machines thinkpad-x200) #:prefix machines:thinkpad-x200:) - #:use-module ((sovereign channels) #:prefix sovereign:channels:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) #:use-module (users id1000)) @@ -32,27 +29,13 @@ ((@ (gnu system keyboard) keyboard-layout) "pl")) -(define (guix-configuration record) - (gnu:services:base:guix-configuration - (inherit record) - (channels (list sovereign:channels:default-guix-channel - sovereign:channels:deployment-channel-staging - sovereign:channels:distribution-channel - sovereign:channels:nonguix-channel - sovereign:channels:sovereign-channel)))) - -(define %sovereign-services* - (gnu:services:modify-services sovereign:systems:%sovereign-services - (gnu:services:base:guix-service-type - record => (guix-configuration record)))) - (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 home-environments))) - (append %sovereign-services* + (append sovereign:systems:%sovereign-services (list guix-home ((@ (gnu services base) udev-rules-service) 'adb-udev diff --git a/users/id1000.scm b/users/id1000.scm index 9d56ae0..d299b19 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) @@ -25,8 +31,8 @@ #:prefix sovereign:services:fontutils:) #:use-module ( (sovereign systems) #:prefix sovereign:systems:) - #:use-module ( (suweren home) - #:prefix suweren:home:)) + #:use-module ( (suweren update) + #:prefix suweren:update:)) (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* suweren:update: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 |