Unify custom home services into tw-home-service-type

Instead of passing around lists of simple-services, create one new
configurable service-type that extends everything it needs to.

Install packages using home-profile-service-type instead of passing around
lists.

1 files changed, 7 insertions, 39 deletions

diff --git a/tw/home/frm.scm b/tw/home/frm.scm
index 03d07830..9123e711 100644
--- a/tw/home/frm.scm
+++ b/tw/home/frm.scm
@@ -9,59 +9,29 @@
   #:use-module (gnu home services)
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services guix)
-  #:use-module (gnu home services mail)
-  #:use-module (gnu home services mcron)
   #:use-module (gnu home services pm)
-  #:use-module (gnu packages android)
-  #:use-module (gnu packages bittorrent)
-  #:use-module (gnu packages calendar)
-  #:use-module (gnu packages dav)
   #:use-module (gnu packages finance)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages mail)
-  #:use-module (gnu packages messaging)
-  #:use-module (gnu packages music)
   #:use-module (gnu packages networking)
-  #:use-module (gnu packages syndication)
-  #:use-module (gnu packages web-browsers)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages xdisorg)
   #:use-module (gnu services)
   #:use-module (guix gexp)
-  #:use-module ((nongnu packages messaging)
-                #:select (signal-desktop))
-  #:use-module ((nongnu packages game-client)
-                #:select (steam))
   #:use-module (tw home)
-  #:use-module (tw packages scanner)
   #:use-module (tw services desktop)
   #:use-module (tw services git)
   #:use-module (tw services gnupg)
-  #:use-module (tw services restic)
-  #:use-module (tw theme))
+  #:use-module (tw services restic))
 
 (define-public %frm-home
   (home-environment
    (packages
     ;; These packages will show up in the home profile, under ~/.guix-home/profile.
-    (cons*
-     ;; CLI tools
-     adb fastboot beets cmus
-
-     ;; Graphical applications
-     blueman electrum nheko signal-desktop simple-scan/airscan transmission-remote-gtk
-
-     ;; Games
-     steam
-     ;; Games are installed in ~/.guix-profile instead, to make updates of the
-     ;; home environment faster.
-     ;; 0ad flightgear freeciv simutrans/pak128 warzone2100 widelands pioneer
-
-     (append %interactive-packages %pim-packages %common-packages)))
+    ;; Graphical applications
+    (list blueman electrum))
 
    ;; To search for available home services, run 'guix home search KEYWORD'.
    (services
-    (cons*
+    (list
+     (service tw-home-service-type)
+
      ;; Batsignal: battery level notifications.
      (service home-batsignal-service-type
        (home-batsignal-configuration
@@ -134,8 +104,6 @@
               (schedule #~"30 */2 * * *")   ; try to avoid lock contention
               (paths '("~/documents" "~/sync" "~/pictures"))
               (repo (restic-vin.wg-repo "timo/sync"))
-              (password (restic-pass-key "computers/vin/restic-repos/timo-sync")))))
-
-     (append (interactive-services) %pim-services %common-services)))))
+              (password (restic-pass-key "computers/vin/restic-repos/timo-sync")))))))))
 
 %frm-home