From 74585be49ce99585f0bfb649402cc807a6802fe7 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sun, 28 Jul 2024 16:53:41 +0200 Subject: refactor!: introduce user obfuscation style --- systems/ayase/system-configuration.scm | 16 +++---- systems/mcdowell.scm | 14 +++--- users/id1000.scm | 81 ++++++++++++++++++++++++++++++++++ users/marekpasnikowski-gitconfig | 10 ----- users/marekpasnikowski-gitignore | 48 -------------------- users/marekpasnikowski.scm | 71 ----------------------------- users/uid1000-gitconfig | 10 +++++ users/uid1000-gitignore | 48 ++++++++++++++++++++ 8 files changed, 152 insertions(+), 146 deletions(-) create mode 100644 users/id1000.scm delete mode 100644 users/marekpasnikowski-gitconfig delete mode 100644 users/marekpasnikowski-gitignore delete mode 100644 users/marekpasnikowski.scm create mode 100644 users/uid1000-gitconfig create mode 100644 users/uid1000-gitignore 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/id1000.scm b/users/id1000.scm new file mode 100644 index 0000000..ae1e32c --- /dev/null +++ b/users/id1000.scm @@ -0,0 +1,81 @@ +(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 uid1000-name + "marek") + +;; (string) -> +;; record user-account +(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"))) + +;; record home-environment +(define-public uid1000-home-environment + (lambda (host-name*) + (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)) + + (emacs-packages (list emacs + emacs-org-roam + emacs-paredit)) + (git-configuration-files (list gitconfig + gitignore)) + (git-packages (list git)) + + (emacs-software (simple-service 'emacs-packages + home-profile-service-type + emacs-packages)) + (git-configuration (simple-service 'git-configuration + home-xdg-configuration-files-service-type + git-configuration-files)) + (git-software (simple-service 'git-packages + home-profile-service-type + git-packages)) + + (%suweren-home-services* (%suweren-home-services host-name*)) + (user-services (list ;; emacs-configuration + emacs-software + git-configuration + git-software)) + + (services* (append %suweren-home-services* + user-services))) + (home-environment (services services*))))) diff --git a/users/marekpasnikowski-gitconfig b/users/marekpasnikowski-gitconfig deleted file mode 100644 index 300f906..0000000 --- a/users/marekpasnikowski-gitconfig +++ /dev/null @@ -1,10 +0,0 @@ -[commit] - gpgsign = true - -[user] - email = marek@marekpasnikowski.pl - name = Marek Paśnikowski - signingkey = 6D81B1207711899F - -[push] - autoSetupRemote = true diff --git a/users/marekpasnikowski-gitignore b/users/marekpasnikowski-gitignore deleted file mode 100644 index 98e588f..0000000 --- a/users/marekpasnikowski-gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# -*- mode: gitignore; -*- -*~ -\#*\# -/.emacs.desktop -/.emacs.desktop.lock -*.elc -auto-save-list -tramp -.\#* - -# Org-mode -.org-id-locations -*_archive - -# flymake-mode -*_flymake.* - -# eshell files -/eshell/history -/eshell/lastdir - -# elpa packages -/elpa/ - -# reftex files -*.rel - -# AUCTeX auto folder -/auto/ - -# cask packages -.cask/ -dist/ - -# Flycheck -flycheck_*.el - -# server auth directory -/server/ - -# projectiles files -.projectile - -# directory configuration -.dir-locals.el - -# network security -/network-security.data diff --git a/users/marekpasnikowski.scm b/users/marekpasnikowski.scm deleted file mode 100644 index e259d55..0000000 --- a/users/marekpasnikowski.scm +++ /dev/null @@ -1,71 +0,0 @@ -(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 - ) - -;; string -(define-public marekpasnikowski-username - "marek") - -;; (string) -> -;; record user-account -(define-public (marekpasnikowski-account supplementary-groups*) - (user-account (name marekpasnikowski-username) - (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 - (lambda (host-name*) - (let* ((gitconfig-file (local-file "marekpasnikowski-gitconfig")) ; TODO modularize - (gitignore-file (local-file "marekpasnikowski-gitignore")) ; TODO review the contents - - (gitconfig (list "git/config" - gitconfig-file)) - (gitignore (list "git/ignore" - gitignore-file)) - - (emacs-packages (list emacs - emacs-org-roam - emacs-paredit)) - (git-configuration-files (list gitconfig - gitignore)) - (git-packages (list git)) - - (emacs-software (simple-service 'emacs-packages - home-profile-service-type - emacs-packages)) - (git-configuration (simple-service 'git-configuration - home-xdg-configuration-files-service-type - git-configuration-files)) - (git-software (simple-service 'git-packages - home-profile-service-type - git-packages)) - - (%suweren-home-services* (%suweren-home-services host-name*)) - (user-services (list ;; emacs-configuration - emacs-software - git-configuration - git-software)) - - (services* (append %suweren-home-services* - user-services))) - (home-environment (services services*))))) diff --git a/users/uid1000-gitconfig b/users/uid1000-gitconfig new file mode 100644 index 0000000..300f906 --- /dev/null +++ b/users/uid1000-gitconfig @@ -0,0 +1,10 @@ +[commit] + gpgsign = true + +[user] + email = marek@marekpasnikowski.pl + name = Marek Paśnikowski + signingkey = 6D81B1207711899F + +[push] + autoSetupRemote = true diff --git a/users/uid1000-gitignore b/users/uid1000-gitignore new file mode 100644 index 0000000..98e588f --- /dev/null +++ b/users/uid1000-gitignore @@ -0,0 +1,48 @@ +# -*- mode: gitignore; -*- +*~ +\#*\# +/.emacs.desktop +/.emacs.desktop.lock +*.elc +auto-save-list +tramp +.\#* + +# Org-mode +.org-id-locations +*_archive + +# flymake-mode +*_flymake.* + +# eshell files +/eshell/history +/eshell/lastdir + +# elpa packages +/elpa/ + +# reftex files +*.rel + +# AUCTeX auto folder +/auto/ + +# cask packages +.cask/ +dist/ + +# Flycheck +flycheck_*.el + +# server auth directory +/server/ + +# projectiles files +.projectile + +# directory configuration +.dir-locals.el + +# network security +/network-security.data -- cgit v1.2.3