Merge branch 'dedistribution'

1 files changed, 57 insertions, 37 deletions

diff --git a/users/id1000.scm b/users/id1000.scm
index 5c46019..056654f 100644
--- a/users/id1000.scm
+++ b/users/id1000.scm
@@ -1,16 +1,32 @@
 (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 audio)
+                 #:prefix gnu:packages:audio:)
+  #: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 ( (sovereign services fontutils)
+                 #:prefix sovereign:services:fontutils:)
+  #:use-module ( (sovereign systems)
+                 #:prefix sovereign:systems:)
+  #:use-module ( (suweren home)
+                 #:prefix suweren:home:))
 
 (guix:records:define-record-type* <dkimproxy-out-signature-configuration>
   dkimproxy-out-signature-configuration
@@ -496,6 +512,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*))
@@ -522,33 +545,30 @@
 
 (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-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))
-      (l-services               (append suweren:home:%suweren-home-services
-                                        user-services)))
-    (gnu:home:home-environment  (services l-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
+                                     sovereign:systems:bash-configuration
+                                     environment-variables
+                                     git-configuration
+                                     sovereign:services:fontutils:home-fontconfig-service-type))
+      (l-services              (append suweren:home:%suweren-home-services
+                                       user-services)))
+    (gnu:home:home-environment
+      (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
   (list uid1000-name