From 51d5a0a5625a380633fb76000f38844bbab69e8b Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Sat, 13 Jul 2024 15:35:07 +0200
Subject: fix ayase: properly implement user packages

---
 systems/ayase/system-configuration.scm | 15 ++++-----------
 users/marekpasnikowski.scm             | 31 +++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm
index a02c21a..a9b1dfd 100644
--- a/systems/ayase/system-configuration.scm
+++ b/systems/ayase/system-configuration.scm
@@ -6,8 +6,7 @@
   #:use-module (nongnu packages linux)
   #:use-module (nongnu system linux-initrd)
   #:use-module (suweren commons sudoers)
-  #:use-module (suweren services)
-  #:use-module (users marekpasnikowski))
+  #:use-module (suweren services))
 
 (define-public ayase
   (let* ((bootloader-targets (list "/boot/efi"))
@@ -17,10 +16,6 @@
 					"audio"
 					"video"))
 	 (root-filesystem-id (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c"))
-	 (package-specifications (list "emacs"
-				       "emacs-exwm"
-				       "emacs-desktop-environment"
-				       "emacs-paredit"))
 
 	 (efi-partition (file-system (mount-point "/boot/efi")
 				     (device efi-filesystem-id)
@@ -40,8 +35,6 @@
 	 (ayase-user-accounts (list marekpasnikowski-account))
 	 (keyboard-layout (keyboard-layout "pl"))
 	 (main-swap (swap-space (target swap-space-id)))
-	 (system-packages (map specification->package
-			       package-specifications))
 	 (system-services (list (service openssh-service-type)
 				(service tor-service-type)))
 
@@ -54,9 +47,10 @@
 	 (firmware (list linux-firmware))
 	 (packages (append %base-packages
 			   ;; %distribution-packages
-			   system-packages))
+			   ;; system-packages
+			   ))
 	 (services (append %distribution-services
-			   marekpasnikowski-services
+			   ;; marekpasnikowski-services
 			   system-services))
 	 (swap-devices (list main-swap))
 	 (users (append %base-user-accounts
@@ -70,7 +64,6 @@
                       (file-systems file-systems)
                       (swap-devices swap-devices)
                       (users users)
-                      (packages packages)
                       (timezone "Europe/Warsaw")
                       (locale "pl_PL.utf8")
                       (services services)
diff --git a/users/marekpasnikowski.scm b/users/marekpasnikowski.scm
index 1236c3b..d45926e 100644
--- a/users/marekpasnikowski.scm
+++ b/users/marekpasnikowski.scm
@@ -1,10 +1,29 @@
 (define-module (users marekpasnikowski)
-  #:use-module (gnu home)
-  #:use-module (suweren home)
-  #:use-module (suweren trezor))
+  #:use-module (gnu home) ; home-environment
+  #:use-module (gnu home services) ; home-profile-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 services) ; simple-service
+  #:use-module (suweren home) ; %home-environment %suweren-home-services
+  #:use-module (suweren trezor)) ; trezor-bridge
 
-(define-public marekpasnikowski-services
-  (append trezor-bridge))
+(define marekpasnikowski-services
+  (let* ((packages (list emacs
+			 emacs-org-roam
+			 emacs-paredit
+			 librewolf))
+
+	 (profile (list (simple-service 'marekpasnikowski-packages
+					home-profile-service-type
+					packages))))
+    (append %suweren-home-services
+	    profile
+	    ;; trezor-bridge
+	    )))
 
 (define-public home
-  (home-environment (inherit %home-environment)))
+  (let ((services (append %suweren-home-services
+			  marekpasnikowski-services)))
+    (home-environment (inherit %home-environment)
+		      (services marekpasnikowski-services))))
-- 
cgit v1.2.3