degrade the uid1000-home-environment function to a procedure

2 files changed, 29 insertions, 31 deletions

diff --git a/systems/ayase-old.scm b/systems/ayase-old.scm
index 0537f10..ec9ec35 100644
--- a/systems/ayase-old.scm
+++ b/systems/ayase-old.scm
@@ -65,10 +65,9 @@
 
 (define (home-services)
   (use-modules (gnu services guix))
-  (let ((uid1000-home-environment* (users:id1000:uid1000-home-environment host-name)))
     ((@ (gnu services) service)
      guix-home-service-type
-     `((,users:id1000:uid1000-name ,uid1000-home-environment*)))))
+     `((,users:id1000:uid1000-name ,users:id1000:uid1000-home-environment))))
 
 (define keyboard-layout
   ((@ (gnu system keyboard) keyboard-layout)
diff --git a/users/id1000.scm b/users/id1000.scm
index fb40b30..d051cf6 100644
--- a/users/id1000.scm
+++ b/users/id1000.scm
@@ -521,32 +521,31 @@
                  (home-directory "/home/marek")))
 
 (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))
-        (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)))))
+  (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))))