From 53a5925671d785db6139ad2bc4d4e3d18e208470 Mon Sep 17 00:00:00 2001
From: Kenny Ballou <kb@devnulllabs.io>
Date: Mon, 25 Sep 2023 11:47:36 -0600
Subject: config: flatpak: merge into vars

Signed-off-by: Kenny Ballou <kb@devnulllabs.io>
---
 kbg/services/config/dotfiles.scm |  4 ----
 kbg/services/config/flatpak.scm  | 11 -----------
 kbg/services/config/vars.scm     |  4 +++-
 3 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 kbg/services/config/flatpak.scm

(limited to 'kbg')

diff --git a/kbg/services/config/dotfiles.scm b/kbg/services/config/dotfiles.scm
index 2bd0d188..041241ca 100644
--- a/kbg/services/config/dotfiles.scm
+++ b/kbg/services/config/dotfiles.scm
@@ -7,7 +7,6 @@
   #:use-module (kbg services config chktex)
   #:use-module (kbg services config direnv)
   #:use-module (kbg services config email)
-  #:use-module (kbg services config flatpak)
   #:use-module (kbg services config git)
   #:use-module (kbg services config global)
   #:use-module (kbg services config gnupg)
@@ -35,7 +34,6 @@
           chktex-config-service
           direnv-config-service
           email-config-service
-          flatpak-config-service
           git-config-service
           ;; global-config-service
           gnupg-config-service
@@ -58,7 +56,6 @@
           chktex-config-service
           direnv-config-service
           email-config-service
-          flatpak-config-service
           git-config-service
           ;; global-config-service
           gnupg-config-service
@@ -107,7 +104,6 @@
 (define koi-configs
   (append direnv-config-service
           email-config-service
-          flatpak-config-service
           git-config-service
           ;; global-config-service
           gnupg-config-service
diff --git a/kbg/services/config/flatpak.scm b/kbg/services/config/flatpak.scm
deleted file mode 100644
index 1721b695..00000000
--- a/kbg/services/config/flatpak.scm
+++ /dev/null
@@ -1,11 +0,0 @@
-(define-module (kbg services config flatpak)
-  #:use-module (kbg)
-  #:use-module (gnu)
-  #:use-module (guix)
-  #:use-module (gnu home services))
-
-(define-public flatpak-config-service
-  (list (simple-service 'add-flatpak-to-xdg-data-dirs
-                        home-environment-variables-service-type
-                        '(("XDG_DATA_DIRS" .
-                           "${XDG_DATA_DIRS}:/var/lib/flatpak/exports/share:${XDG_DATA_HOME}/flatpak/exports/share")))))
diff --git a/kbg/services/config/vars.scm b/kbg/services/config/vars.scm
index 55f02cdc..76e8dc06 100644
--- a/kbg/services/config/vars.scm
+++ b/kbg/services/config/vars.scm
@@ -18,4 +18,6 @@
                           ("GUIX_PROFILE" . "${HOME}/.guix-home/profile")
                           ("MPD_HOST" . "/run/user/1000/mpd/socket")
                           ("NAUTILUS_EXTENSION_PATH" . "/run/current-system/profile/lib/nautilus/site-extensions")
-                          ("PARALLEL_HOME" . "${XDG_CACHE_HOME}/parallel")))))
+                          ("PARALLEL_HOME" . "${XDG_CACHE_HOME}/parallel")
+                          ("XDG_DATA_DIRS" . ,(string-append "${XDG_DATA_DIRS}:/var/lib/flatpak/exports/share:"
+                                                             "${XDG_DATA_HOME}/flatpak/exports/share"))))))
-- 
cgit v1.2.1