diff options
| -rw-r--r-- | deployment/systems/cokolwiek.scm | 29 | ||||
| -rw-r--r-- | users/id1001.scm | 26 |
2 files changed, 38 insertions, 17 deletions
diff --git a/deployment/systems/cokolwiek.scm b/deployment/systems/cokolwiek.scm index 202266c..b306952 100644 --- a/deployment/systems/cokolwiek.scm +++ b/deployment/systems/cokolwiek.scm @@ -68,23 +68,24 @@ (define system (let* - ( (l-guix-homes (list users:id1000:name/home-environment)) - (l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes)) + ( (l-guix-homes (list users:id1000:name/home-environment + users:id1001:name/home-environment)) + (l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes)) (l-bootloader (sovereign:devices:amd64:custom-bootloader-configuration system-name)) - (l-file-systems (cons* file-system-root - file-system-efi - gnu:system:file-systems:%base-file-systems)) + (l-file-systems (cons* file-system-root + file-system-efi + gnu:system:file-systems:%base-file-systems)) (l-firmware (list nongnu:packages:linux:linux-firmware)) - (l-initrd-modules (cons* "mei_me" - gnu:system:linux-initrd:%base-initrd-modules)) - (l-services (cons* l-guix-home-service - (gnu:services:service gnu:services:ssh:openssh-service-type) - sovereign:packages:protonmail:nogui-profile - sovereign:systems:%sovereign-services)) + (l-initrd-modules (cons* "mei_me" + gnu:system:linux-initrd:%base-initrd-modules)) + (l-services (cons* l-guix-home-service + (gnu:services:service gnu:services:ssh:openssh-service-type) + sovereign:packages:protonmail:nogui-profile + sovereign:systems:%sovereign-services)) (l-swap-devices (list swap)) - (l-users (cons* users:id1000:uid1000-account - users:id1001:uid1001-account - gnu:system:shadow:%base-user-accounts))) + (l-users (cons* users:id1000:uid1000-account + users:id1001:user-account + gnu:system:shadow:%base-user-accounts))) (gnu:system:operating-system (kernel nongnu:packages:linux:linux) (bootloader l-bootloader) diff --git a/users/id1001.scm b/users/id1001.scm index 96f0b46..745cf75 100644 --- a/users/id1001.scm +++ b/users/id1001.scm @@ -4,11 +4,31 @@ (define-module (users id1001) #:use-module ( (deployment users) #:prefix deployment:users:) + #:use-module ( (gnu home) + #:prefix gnu:home:) #:use-module ( (gnu system accounts) - #:prefix gnu:system:accounts:)) + #:prefix gnu:system:accounts:) + #:use-module ( (sovereign services admin) + #:prefix sovereign:services:admin:) + #:use-module ( (sovereign systems) + #:prefix sovereign:systems:)) -(define-public uid1001-account +(define name + "janusz") + +(define home-environment + (let + ( (l-services (list sovereign:services:admin:update-commands))) + (gnu:home:home-environment + (packages sovereign:systems:common-home-environment-packages) + (services l-services)))) + +(define-public name/home-environment + (list name + home-environment)) + +(define-public user-account (gnu:system:accounts:user-account - (name "janusz") + (name name) (password deployment:users:initial-password) (group "users"))) |