diff options
| -rw-r--r-- | systems/ayase/system-configuration.scm | 16 | ||||
| -rw-r--r-- | systems/mcdowell.scm | 14 | ||||
| -rw-r--r-- | users/id1000.scm (renamed from users/marekpasnikowski.scm) | 60 | ||||
| -rw-r--r-- | users/uid1000-gitconfig (renamed from users/marekpasnikowski-gitconfig) | 0 | ||||
| -rw-r--r-- | users/uid1000-gitignore (renamed from users/marekpasnikowski-gitignore) | 0 |
5 files changed, 48 insertions, 42 deletions
diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index 3f4506a..b31d5f0 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -16,10 +16,10 @@ ;;#:use-module (gnu services xorg) - ;; marekpasnikowski-account - ;; marekpasnikowski-home-environment - ;; marekpasnikowski-username - #:use-module (users marekpasnikowski) + ;; uid1000-account + ;; uid1000-home-environment + ;; uid1000-name + #:use-module (users id1000) ;; linux ;; linux-firmware @@ -42,16 +42,14 @@ (define users* (let* ((system-groups (list "wheel")) - (supplementary-groups* (append system-groups)) - - (marekpasnikowski (marekpasnikowski-account supplementary-groups*))) - (list marekpasnikowski))) + (supplementary-groups* (append system-groups))) + (list (uid1000-account supplementary-groups*)))) ;; record operating-system (define-public ayase (let* ((bootloader-targets (list "/boot/efi")) (efi-filesystem-id (uuid "B4FB-CBD9" 'fat32)) - (home-environments `((,marekpasnikowski-username ,(marekpasnikowski-home-environment host-name*)))) + (home-environments `((,uid1000-name ,(uid1000-home-environment host-name*)))) (root-filesystem-id (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c")) (efi-partition (file-system (mount-point "/boot/efi") diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm index 5b2aeca..ed74873 100644 --- a/systems/mcdowell.scm +++ b/systems/mcdowell.scm @@ -9,9 +9,9 @@ ; initrd* ; kernel* #:use-module (suweren system) ; %suweren-operating-system - #:use-module (users marekpasnikowski) ; marekpasnikowski-account - ; marekpasnikowski-home-environment - ; marekpasnikowski-username + #:use-module (users id1000) ; uid1000-account + ; uid1000-home-environment + ; uid1000-name ) ;; string @@ -23,14 +23,12 @@ (let* ((system-groups (list "wheel")) (supplementary-groups* (append hardware-groups - system-groups)) - - (marekpasnikowski (marekpasnikowski-account supplementary-groups*))) - (list marekpasnikowski))) + system-groups))) + (list (uid1000-account supplementary-groups*)))) ;; record operating-system (define operating-system* - (let* ((home-environments `((,marekpasnikowski-username ,(marekpasnikowski-home-environment host-name*)))) + (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*)))) (guix-home (service guix-home-service-type home-environments)) diff --git a/users/marekpasnikowski.scm b/users/id1000.scm index e259d55..ae1e32c 100644 --- a/users/marekpasnikowski.scm +++ b/users/id1000.scm @@ -1,42 +1,52 @@ -(define-module (users marekpasnikowski) - #:use-module (gnu home) ; home-environment - #:use-module (gnu home services) ; home-profile-service-type - ; home-xdg-configuration-files-service-type - #:use-module (gnu packages emacs) ; emacs - #:use-module (gnu packages emacs-xyz) ; emacs-org-roam - ; emacs-paredit - #:use-module (gnu packages librewolf) ; librewolf - #:use-module (gnu packages version-control) ; git - #:use-module (gnu services) ; service - ; simple-service - #:use-module (gnu system shadow) ; user-account - #:use-module (guix gexp) ; file-append - #:use-module (suweren home) ; %suweren-home-services - ) +(define-module (users id1000) + ;; home-environment + #:use-module (gnu home) + + ;; home-profile-service-type + ;; home-xdg-configuration-files-service-type + #:use-module (gnu home services) + + ;; emacs + #:use-module (gnu packages emacs) + + ;; emacs-org-roam + ;; emacs-paredit + #:use-module (gnu packages emacs-xyz) + + ;; git + #:use-module (gnu packages version-control) + + ;; simple-service + #:use-module (gnu services) + + ;; user-account + #:use-module (gnu system shadow) + + ;; local-file + #:use-module (guix gexp) + + ;; %suweren-home-services + #:use-module (suweren home)) ;; string -(define-public marekpasnikowski-username +(define-public uid1000-name "marek") ;; (string) -> ;; record user-account -(define-public (marekpasnikowski-account supplementary-groups*) - (user-account (name marekpasnikowski-username) +(define-public (uid1000-account supplementary-groups*) + (user-account (name uid1000-name) (group "users") (supplementary-groups supplementary-groups*) (uid 1000) (comment "Marek Paśnikowski") (home-directory "/home/marek"))) -;; string -(define-public user - "marek") - ;; record home-environment -(define-public marekpasnikowski-home-environment +(define-public uid1000-home-environment (lambda (host-name*) - (let* ((gitconfig-file (local-file "marekpasnikowski-gitconfig")) ; TODO modularize - (gitignore-file (local-file "marekpasnikowski-gitignore")) ; TODO review the contents + (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)) diff --git a/users/marekpasnikowski-gitconfig b/users/uid1000-gitconfig index 300f906..300f906 100644 --- a/users/marekpasnikowski-gitconfig +++ b/users/uid1000-gitconfig diff --git a/users/marekpasnikowski-gitignore b/users/uid1000-gitignore index 98e588f..98e588f 100644 --- a/users/marekpasnikowski-gitignore +++ b/users/uid1000-gitignore |