feat: streamline %home-environment, change firefox to librewolf

1 files changed, 37 insertions, 16 deletions

diff --git a/suweren/home.scm b/suweren/home.scm
index ed8bcab..c441b6f 100644
--- a/suweren/home.scm
+++ b/suweren/home.scm
@@ -1,35 +1,56 @@
 (define-module (suweren home)
-  #:use-module (gnu home)
+  ;; home-profile-service-type
+  #:use-module (gnu home services)
+
+  ;; home-dbus-service-type
   #:use-module (gnu home services desktop)
+
+  ;; home-bash-service-type
   #:use-module (gnu home services shells)
+
+  ;; home-shepherd-service-type
   #:use-module (gnu home services shepherd)
+
+  ;; home-pipewire-service-type
   #:use-module (gnu home services sound)
-  #:use-module (gnu packages fonts)
+
+  ;; gnupg
   #:use-module (gnu packages gnupg)
+
+  ;; librewolf
+  #:use-module (gnu packages librewolf)
+
+  ;; service
+  ;; simple-service
   #:use-module (gnu services)
-  #:use-module (nongnu packages mozilla)
+
+  ;; suweren-home-bash-configuration
+  ;; suweren-home-xdg-configuration-files-extension
   #:use-module (suweren home services)
+
+  ;; suweren-home-fontconfig-service-type
   #:use-module (suweren home services fontutils)
-  #:use-module (suweren services sound)
+
+  ;; update-commands
   #:use-module (suweren update))
 
 (define-public %suweren-home-services
-  (let ((bash (service home-bash-service-type
-		       suweren-home-bash-configuration))
-	(dbus (service home-dbus-service-type))
-	(pipewire (service home-pipewire-service-type))
-	(shepherd (service home-shepherd-service-type)))
+  (let* ((packages (list gnupg
+			 librewolf))
+
+	 (bash (service home-bash-service-type
+			suweren-home-bash-configuration))
+	 (dbus (service home-dbus-service-type))
+	 (pipewire (service home-pipewire-service-type))
+	 (profile (simple-service 'default-home-packages
+				  home-profile-service-type
+				  packages))
+	 (shepherd (service home-shepherd-service-type)))
     (list bash
 	  dbus
 	  pipewire
+	  profile
 	  shepherd
 	  suweren-home-fontconfig-service-type
 	  suweren-home-xdg-configuration-files-extension
 	  update-commands)))
-
-(define-public %home-environment
-  (let ((packages (list firefox
-			font-gnu-freefont
-			gnupg)))
-    (home-environment (packages packages)
-		      (services %suweren-home-services))))