refactor(marekpasnikowski): merge both home definitions into one

1 files changed, 38 insertions, 36 deletions

diff --git a/users/marekpasnikowski.scm b/users/marekpasnikowski.scm
index e70e19d..54e01d5 100644
--- a/users/marekpasnikowski.scm
+++ b/users/marekpasnikowski.scm
@@ -16,22 +16,6 @@
   #:use-module (suweren home)		      ; %suweren-home-services
   )
 
-;; DEPRECATED
-(define-public home
-  (let* ((packages (list emacs
-			 emacs-org-roam
-			 emacs-paredit))
-
-	 (profile (simple-service 'marekpasnikowski-packages
-				  home-profile-service-type
-				  packages))
-
-	 (user-services (list profile))
-
-	 (services* (append %suweren-home-services
-			    user-services)))
-    (home-environment (services services*))))
-
 ;; string
 (define-public marekpasnikowski-username
   "marek")
@@ -45,29 +29,47 @@
 		  (supplementary-groups supplementary-groups*)
 		  (shell fish))))
 
+;; string
+(define-public user
+  "marekpasnikowski")
+
 ;; record home-environment
 (define-public marekpasnikowski-home-environment
-  (let* ((gitconfig-file (local-file "marekpasnikowski-gitconfig")) ; TODO modularize
-	 (gitignore-file (local-file "marekpasnikowski-gitignore")) ; TODO review the contents
+  (lambda (system)
+    (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))
 
-	 (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))
 
-	 (git-configuration-files (list gitconfig
-					gitignore))
-	 (git-packages (list git))
+	   (emacs-software (simple-service 'emacs-packages
+					   home-profile-service-type
+					   emacs-packages))
+	   (fish (service home-fish-service-type))
+	   (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))
 
-	 (fish (service home-fish-service-type))
-	 (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 system
+							    user))
+	   (user-services (list ;; emacs-configuration
+			   emacs-software
+			   fish
+			   git-configuration
+			   git-software))
 
-	 (services* (list fish
-			  git-configuration
-			  git-software)))
-    (home-environment (services services*))))
+	   (services* (append %suweren-home-services*
+			      user-services)))
+      (home-environment (services services*)))))