diff options
author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-07-27 23:10:47 +0200 |
---|---|---|
committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-07-28 13:39:11 +0200 |
commit | b68e6afd3906a84012d158000f329854252f97d9 (patch) | |
tree | c7a2a73266312ac9effc8c6e1b0278b503cc7af2 /systems | |
parent | f10100c2013e837819acac6bea88fa612d820da7 (diff) |
feat!(ayase): merge the new user account style with ayase system
Diffstat (limited to 'systems')
-rw-r--r-- | systems/ayase/system-configuration.scm | 64 |
1 files changed, 50 insertions, 14 deletions
diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index a9b1dfd..3f4506a 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -1,30 +1,64 @@ (define-module (systems ayase system-configuration) + ;; uuid #:use-module (gnu) + + ;; service + #:use-module (gnu services) + + ;; guix-home-service-type + #:use-module (gnu services guix) + + ;; tor-service-type #:use-module (gnu services networking) + + ;; openssh-service-type #:use-module (gnu services ssh) - #:use-module (gnu services xorg) + + ;;#:use-module (gnu services xorg) + + ;; marekpasnikowski-account + ;; marekpasnikowski-home-environment + ;; marekpasnikowski-username + #:use-module (users marekpasnikowski) + + ;; linux + ;; linux-firmware #:use-module (nongnu packages linux) + + ;; microcode-initrd #:use-module (nongnu system linux-initrd) + + ;; %sudoers-specification* #:use-module (suweren commons sudoers) + + ;; %distribution-services #:use-module (suweren services)) +;; string +(define host-name* + "ayase") + +;; (record user-account) +(define users* + (let* ((system-groups (list "wheel")) + + (supplementary-groups* (append system-groups)) + + (marekpasnikowski (marekpasnikowski-account supplementary-groups*))) + (list marekpasnikowski))) + +;; record operating-system (define-public ayase (let* ((bootloader-targets (list "/boot/efi")) (efi-filesystem-id (uuid "B4FB-CBD9" 'fat32)) - (marekpasnikowski-groups (list "wheel" - "netdev" - "audio" - "video")) + (home-environments `((,marekpasnikowski-username ,(marekpasnikowski-home-environment host-name*)))) (root-filesystem-id (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c")) (efi-partition (file-system (mount-point "/boot/efi") (device efi-filesystem-id) (type "vfat"))) - (marekpasnikowski-account (user-account (name "marekpasnikowski") - (comment "Marek Paśnikowski") - (group "users") - (home-directory "/home/marek") - (supplementary-groups marekpasnikowski-groups))) + (home-services (service guix-home-service-type + home-environments)) (root-partition (file-system (mount-point "/") (device root-filesystem-id) (type "ext4"))) @@ -32,7 +66,7 @@ (ayase-file-systems (list root-partition efi-partition)) - (ayase-user-accounts (list marekpasnikowski-account)) + (home-services (list home-services)) (keyboard-layout (keyboard-layout "pl")) (main-swap (swap-space (target swap-space-id))) (system-services (list (service openssh-service-type) @@ -50,17 +84,17 @@ ;; system-packages )) (services (append %distribution-services - ;; marekpasnikowski-services + home-services system-services)) (swap-devices (list main-swap)) (users (append %base-user-accounts - ayase-user-accounts))) + users*))) (operating-system (kernel linux) (bootloader bootloader) (keyboard-layout keyboard-layout) (initrd microcode-initrd) (firmware firmware) - (host-name "ayase") + (host-name host-name*) (file-systems file-systems) (swap-devices swap-devices) (users users) @@ -68,3 +102,5 @@ (locale "pl_PL.utf8") (services services) (sudoers-file %sudoers-specification*)))) + +ayase |