From 088dfcee79f97693317111145e212e5e21e175a9 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Tue, 17 Jun 2025 11:24:27 +0200 Subject: id1000: change layout of module imports --- users/id1000.scm | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/users/id1000.scm b/users/id1000.scm index 5c46019..97f21fa 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -1,16 +1,26 @@ (define-module (users id1000) #:use-module (guix gexp) #:use-module (ice-9 match) - #:use-module ((gnu home) #:prefix gnu:home:) - #:use-module ((gnu home services) #:prefix gnu:home:services:) - #:use-module ((gnu home services shells) #:prefix gnu:home:services:shells:) - #:use-module ((gnu packages disk) #:prefix gnu:packages:disk:) - #:use-module ((gnu packages kde) #:prefix gnu:packages:kde:) - #:use-module ((gnu packages version-control) #:prefix gnu:packages:version-control:) - #:use-module ((gnu services) #:prefix gnu:services:) - #:use-module ((gnu system accounts) #:prefix gnu:system:accounts:) - #:use-module ((guix records) #:prefix guix:records:) - #:use-module ((suweren home) #:prefix suweren:home:)) + #:use-module ((gnu home) + #:prefix gnu:home:) + #:use-module ((gnu home services) + #:prefix gnu:home:services:) + #:use-module ((gnu home services shells) + #:prefix gnu:home:services:shells:) + #:use-module ((gnu packages disk) + #:prefix gnu:packages:disk:) + #:use-module ((gnu packages kde) + #:prefix gnu:packages:kde:) + #:use-module ((gnu packages version-control) + #:prefix gnu:packages:version-control:) + #:use-module ((gnu services) + #:prefix gnu:services:) + #:use-module ((gnu system accounts) + #:prefix gnu:system:accounts:) + #:use-module ((guix records) + #:prefix guix:records:) + #:use-module ((suweren home) + #:prefix suweren:home:)) (guix:records:define-record-type* dkimproxy-out-signature-configuration -- cgit v1.2.3 From 915c292ea35d765e85785ce72cd5226e8161a4b8 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Tue, 17 Jun 2025 12:18:49 +0200 Subject: uid1000-home-environment: consolidate packages in the dedicated field --- users/id1000.scm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/users/id1000.scm b/users/id1000.scm index 97f21fa..e7bd1f3 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -540,25 +540,18 @@ gitignore-file)) (git-configuration-files (list gitconfig gitignore)) - (git-packages (list gnu:packages:version-control:git)) - (packages (list gnu:packages:disk:gparted - gnu:packages:kde:okular)) (git-configuration (gnu:services:simple-service 'git-configuration gnu:home:services:home-xdg-configuration-files-service-type git-configuration-files)) - (git-software (gnu:services:simple-service 'git-packages - gnu:home:services:home-profile-service-type - git-packages)) - (profile (gnu:services:simple-service 'user-packages - gnu:home:services:home-profile-service-type - packages)) (user-services (list bash - git-configuration - git-software - profile)) + git-configuration)) (l-services (append suweren:home:%suweren-home-services user-services))) - (gnu:home:home-environment (services l-services)))) + (gnu:home:home-environment + (packages (list gnu:packages:version-control:git + gnu:packages:disk:gparted + gnu:packages:kde:okular)) + (services l-services)))) (define-public name/home-environment (list uid1000-name -- cgit v1.2.3 From f1a33a138575f91ba59bfd418e2ec2023d20938b Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Tue, 17 Jun 2025 12:37:28 +0200 Subject: uid1000-home-environment: transfer in packages from %suweren-home-services --- users/id1000.scm | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/users/id1000.scm b/users/id1000.scm index e7bd1f3..87a456d 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -7,10 +7,22 @@ #:prefix gnu:home:services:) #:use-module ((gnu home services shells) #:prefix gnu:home:services:shells:) + #:use-module ((gnu packages audio) + #:prefix gnu:packages:audio:) #:use-module ((gnu packages disk) #:prefix gnu:packages:disk:) + #:use-module ((gnu packages fonts) + #:prefix gnu:packages:fonts:) + #:use-module ((gnu packages gnupg) + #:prefix gnu:packages:gnupg:) #:use-module ((gnu packages kde) #:prefix gnu:packages:kde:) + #:use-module ((gnu packages kde-frameworks) + #:prefix gnu:packages:kde-frameworks:) + #:use-module ((gnu packages kde-plasma) + #:prefix gnu:packages:kde-plasma:) + #:use-module ((gnu packages librewolf) + #:prefix gnu:packages:librewolf:) #:use-module ((gnu packages version-control) #:prefix gnu:packages:version-control:) #:use-module ((gnu services) @@ -532,25 +544,33 @@ (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 - git-configuration)) - (l-services (append suweren:home:%suweren-home-services - user-services))) + ( (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 + git-configuration)) + (l-services (append suweren:home:%suweren-home-services + user-services))) (gnu:home:home-environment - (packages (list gnu:packages:version-control:git + (packages (list gnu:packages:audio:easyeffects + gnu:packages:fonts:font-gnu-unifont + gnu:packages:version-control:git + gnu:packages:gnupg:gnupg gnu:packages:disk:gparted - gnu:packages:kde:okular)) + gnu:packages:kde-plasma:kde-gtk-config + gnu:packages:kde-frameworks:kded + gnu:packages:librewolf:librewolf + gnu:packages:kde:okular + gnu:packages:gnupg:pinentry-qt + gnu:packages:gnupg:pinentry-tty)) (services l-services)))) (define-public name/home-environment -- cgit v1.2.3 From 069657f4929806aa0d0cb914f401ef5ae4caa8a8 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Tue, 17 Jun 2025 13:37:21 +0200 Subject: id1000: adjust formatting of module imports --- users/id1000.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/users/id1000.scm b/users/id1000.scm index 87a456d..b6aa861 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -1,37 +1,37 @@ (define-module (users id1000) #:use-module (guix gexp) #:use-module (ice-9 match) - #:use-module ((gnu home) + #:use-module ( (gnu home) #:prefix gnu:home:) - #:use-module ((gnu home services) + #:use-module ( (gnu home services) #:prefix gnu:home:services:) - #:use-module ((gnu home services shells) + #:use-module ( (gnu home services shells) #:prefix gnu:home:services:shells:) - #:use-module ((gnu packages audio) + #:use-module ( (gnu packages audio) #:prefix gnu:packages:audio:) - #:use-module ((gnu packages disk) + #:use-module ( (gnu packages disk) #:prefix gnu:packages:disk:) - #:use-module ((gnu packages fonts) + #:use-module ( (gnu packages fonts) #:prefix gnu:packages:fonts:) - #:use-module ((gnu packages gnupg) + #:use-module ( (gnu packages gnupg) #:prefix gnu:packages:gnupg:) - #:use-module ((gnu packages kde) + #:use-module ( (gnu packages kde) #:prefix gnu:packages:kde:) - #:use-module ((gnu packages kde-frameworks) + #:use-module ( (gnu packages kde-frameworks) #:prefix gnu:packages:kde-frameworks:) - #:use-module ((gnu packages kde-plasma) + #:use-module ( (gnu packages kde-plasma) #:prefix gnu:packages:kde-plasma:) - #:use-module ((gnu packages librewolf) + #:use-module ( (gnu packages librewolf) #:prefix gnu:packages:librewolf:) - #:use-module ((gnu packages version-control) + #:use-module ( (gnu packages version-control) #:prefix gnu:packages:version-control:) - #:use-module ((gnu services) + #:use-module ( (gnu services) #:prefix gnu:services:) - #:use-module ((gnu system accounts) + #:use-module ( (gnu system accounts) #:prefix gnu:system:accounts:) - #:use-module ((guix records) + #:use-module ( (guix records) #:prefix guix:records:) - #:use-module ((suweren home) + #:use-module ( (suweren home) #:prefix suweren:home:)) (guix:records:define-record-type* -- cgit v1.2.3 From c8fe2ad749d185d7e1d65837beb6bb579a165358 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Tue, 17 Jun 2025 22:17:37 +0200 Subject: id1000: transfer in bash configuration from the distribution repository --- users/id1000.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/users/id1000.scm b/users/id1000.scm index b6aa861..1d4137b 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -518,6 +518,32 @@ ;;; +(define bash-prompt-configuration-core + " PS1='\\n\\n\\t $?\\n\\u@\\H \\w\\n\\! ") + +(define bash-prompt-configuration + (mixed-text-file "bash-prompt" + "\n" + "if [ -n \"$GUIX_ENVIRONMENT\" ] \n" + "then\n" + bash-prompt-configuration-core + "[env] \\$ '\n" + "else\n" + bash-prompt-configuration-core + "\\$ '\n" + "fi")) + +(define bash-extension + (gnu:home:services:shells:home-bash-extension + (aliases (list '("edit" . "$EDITOR"))) + (bash-profile (list bash-prompt-configuration)) + (bashrc (list bash-prompt-configuration)))) + +(define bash-configuration + (gnu:services:simple-service 'uid1000-bash-configuration + gnu:home:services:shells:home-bash-service-type + bash-extension)) + (define-public dkim-service (gnu:services:service dkimproxy-out-service-type dkimproxy-out-configuration*)) @@ -556,6 +582,7 @@ gnu:home:services:home-xdg-configuration-files-service-type git-configuration-files)) (user-services (list bash + bash-configuration git-configuration)) (l-services (append suweren:home:%suweren-home-services user-services))) -- cgit v1.2.3 From a2dbe443bd26bcb57bcfc5a59d7ab0522dc864f8 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 18 Jun 2025 10:33:11 +0200 Subject: id1000: transfer out common home-environment packages to sovereign repository --- users/id1000.scm | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/users/id1000.scm b/users/id1000.scm index 1d4137b..a0f850d 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -11,18 +11,8 @@ #:prefix gnu:packages:audio:) #:use-module ( (gnu packages disk) #:prefix gnu:packages:disk:) - #:use-module ( (gnu packages fonts) - #:prefix gnu:packages:fonts:) - #:use-module ( (gnu packages gnupg) - #:prefix gnu:packages:gnupg:) #:use-module ( (gnu packages kde) #:prefix gnu:packages:kde:) - #:use-module ( (gnu packages kde-frameworks) - #:prefix gnu:packages:kde-frameworks:) - #:use-module ( (gnu packages kde-plasma) - #:prefix gnu:packages:kde-plasma:) - #:use-module ( (gnu packages librewolf) - #:prefix gnu:packages:librewolf:) #:use-module ( (gnu packages version-control) #:prefix gnu:packages:version-control:) #:use-module ( (gnu services) @@ -31,6 +21,8 @@ #:prefix gnu:system:accounts:) #:use-module ( (guix records) #:prefix guix:records:) + #:use-module ( (sovereign systems) + #:prefix sovereign:systems:) #:use-module ( (suweren home) #:prefix suweren:home:)) @@ -587,17 +579,10 @@ (l-services (append suweren:home:%suweren-home-services user-services))) (gnu:home:home-environment - (packages (list gnu:packages:audio:easyeffects - gnu:packages:fonts:font-gnu-unifont - gnu:packages:version-control:git - gnu:packages:gnupg:gnupg - gnu:packages:disk:gparted - gnu:packages:kde-plasma:kde-gtk-config - gnu:packages:kde-frameworks:kded - gnu:packages:librewolf:librewolf - gnu:packages:kde:okular - gnu:packages:gnupg:pinentry-qt - gnu:packages:gnupg:pinentry-tty)) + (packages (cons* gnu:packages:audio:easyeffects + gnu:packages:version-control:git + gnu:packages:disk:gparted + sovereign:systems:common-home-environment-packages)) (services l-services)))) (define-public name/home-environment -- cgit v1.2.3 From 3e949244b1ee5aaaa63958b64bb4e7208fce7b2a Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 18 Jun 2025 10:43:27 +0200 Subject: id1000: transfer out common bash configuration to sovereign repository --- users/id1000.scm | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/users/id1000.scm b/users/id1000.scm index a0f850d..17ecdb8 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -510,32 +510,6 @@ ;;; -(define bash-prompt-configuration-core - " PS1='\\n\\n\\t $?\\n\\u@\\H \\w\\n\\! ") - -(define bash-prompt-configuration - (mixed-text-file "bash-prompt" - "\n" - "if [ -n \"$GUIX_ENVIRONMENT\" ] \n" - "then\n" - bash-prompt-configuration-core - "[env] \\$ '\n" - "else\n" - bash-prompt-configuration-core - "\\$ '\n" - "fi")) - -(define bash-extension - (gnu:home:services:shells:home-bash-extension - (aliases (list '("edit" . "$EDITOR"))) - (bash-profile (list bash-prompt-configuration)) - (bashrc (list bash-prompt-configuration)))) - -(define bash-configuration - (gnu:services:simple-service 'uid1000-bash-configuration - gnu:home:services:shells:home-bash-service-type - bash-extension)) - (define-public dkim-service (gnu:services:service dkimproxy-out-service-type dkimproxy-out-configuration*)) @@ -574,7 +548,7 @@ gnu:home:services:home-xdg-configuration-files-service-type git-configuration-files)) (user-services (list bash - bash-configuration + sovereign:systems:bash-configuration git-configuration)) (l-services (append suweren:home:%suweren-home-services user-services))) -- cgit v1.2.3 From 8379d5ff8ba755c62855ab03110dcf31c40fb263 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 18 Jun 2025 10:55:54 +0200 Subject: id1000: transfer in environment-variables from distribution repository --- users/id1000.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/users/id1000.scm b/users/id1000.scm index 17ecdb8..e91e88b 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -510,6 +510,13 @@ ;;; +(define environment-variables + (let + ( (l-variables (list '("EDITOR" . "kate -s sesja -b")))) + (gnu:services:simple-service 'id1000-environment-variables + gnu:home:services:home-environment-variables-service-type + l-variables))) + (define-public dkim-service (gnu:services:service dkimproxy-out-service-type dkimproxy-out-configuration*)) @@ -549,6 +556,7 @@ git-configuration-files)) (user-services (list bash sovereign:systems:bash-configuration + environment-variables git-configuration)) (l-services (append suweren:home:%suweren-home-services user-services))) -- cgit v1.2.3 From 95eec5043f4b831a095993cd4090b9833f909dac Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 18 Jun 2025 11:35:15 +0200 Subject: id1000: use home-fontconfig-service-type from sovereign repository --- users/id1000.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/users/id1000.scm b/users/id1000.scm index e91e88b..056654f 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -21,6 +21,8 @@ #:prefix gnu:system:accounts:) #:use-module ( (guix records) #:prefix guix:records:) + #:use-module ( (sovereign services fontutils) + #:prefix sovereign:services:fontutils:) #:use-module ( (sovereign systems) #:prefix sovereign:systems:) #:use-module ( (suweren home) @@ -557,7 +559,8 @@ (user-services (list bash sovereign:systems:bash-configuration environment-variables - git-configuration)) + git-configuration + sovereign:services:fontutils:home-fontconfig-service-type)) (l-services (append suweren:home:%suweren-home-services user-services))) (gnu:home:home-environment -- cgit v1.2.3