Flatpak, ente photos, dns/net utils

guix-config/home/services/flatpak.scm

@@ -1,6 +1,7 @@
 (define-module (guix-config home services flatpak)
   #:use-module (gnu home services)
   #:use-module (gnu home services utils)
+  #:use-module (gnu home services shells)
   #:use-module (gnu services)
   #:use-module (gnu packages package-management)
   #:use-module (guix gexp)
@@ -43,29 +44,13 @@
          (run (string-append "flatpak install -y --user " app)))
        '#$(home-flatpak-configuration-apps config))))
 
-(define (home-flatpak-service config)
-  (list
-   ;; 1. Ensure flatpak installed
-   (simple-service
-    'flatpak-packages
-    home-profile-service-type
-    (list (home-flatpak-configuration-flatpak-package config)))
+(define (home-flatpak-env config)
+   (home-bash-extension
+    (bashrc
+     (list
+      (file-append (home-flatpak-configuration-flatpak-package config)
+                                      "/etc/profile.d/flatpak.sh")))))
 
-   ;; 2. Add flatpak apps to XDG_DATA_DIRS
-   ;; https://forum.systemcrafters.net/t/gnome-software-center-flatpak-support/1702/3
-   (simple-service 
-    'flatpak-env
-    home-shell-profile-service-type
-    (list (local-file
-           (string-append (getenv "HOME") "/.guix-profile/etc/profile.d/flatpak.sh")
-           "flatpak.sh")))
-
-
-   ;; 3. Activation phase
-   (simple-service
-    'flatpak-activation
-    home-activation-service-type
-    (home-flatpak-activation config))))
 
 (define home-flatpak-service-type
   (service-type
@@ -73,6 +58,8 @@
    (extensions
     (list (service-extension home-profile-service-type
                              (compose list home-flatpak-configuration-flatpak-package))
+	  (service-extension home-bash-service-type
+			     home-flatpak-env)
           (service-extension home-activation-service-type
                              home-flatpak-activation)))
    (default-value (home-flatpak-configuration))