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, 10 insertions, 41 deletions

diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 1a5fb535..42b7c17e 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -10,59 +10,31 @@
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services guix)
   #: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 nvidia)
-                #:select (nvidia-system-monitor))
-  #:use-module ((nongnu packages game-client)
-                #:select (steam-nvidia))
   #: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 %lap-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-nvidia   ; use "steam" for non-NVIDIA Steam client
-     nvidia-system-monitor  ; Qt; installs "qnvsm" binary, but no .desktop file
-     ;; 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
+       (tw-home-configuration
+        (gaming? #t)
+        (nvidia-driver? #t)))
+
      ;; Batsignal: battery level notifications.
      (service home-batsignal-service-type
        (home-batsignal-configuration
@@ -155,9 +127,6 @@
      (service home-gnupg-service-type
        (home-gnupg-configuration
         (default-key "53EC3C06856883DD92355BC22FC78504681F69B0")
-        (gui-pinentry? #t)))
-
-     (append (interactive-services #:nvidia-driver? #t)
-             %pim-services %common-services)))))
+        (gui-pinentry? #t)))))))
 
 %lap-home