1 files changed, 12 insertions, 48 deletions

diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm
index 8cf3be4..b738c4f 100644
--- a/oni/home/config/data.scm
+++ b/oni/home/config/data.scm
@@ -38,62 +38,26 @@
   #:use-module ((oni home services mail)
                 #:select (home-mbsync-service-type))
   #:use-module (oni home services syncthing)
+  #:use-module (oni home services wm)
   #:use-module ((oni packages emacs)
                 #:select (emacs-outli
                           emacs-syncthing-status))
-  #:use-module ((oni packages emacs-config)
-                #:select (emacs-oni-org-roam
-                          emacs-oni-vterm
-                          emacs-oni-elisp
-                          emacs-oni-eshell
-                          emacs-oni-core
-                          emacs-oni-compilation
-                          emacs-oni-common-lisp
-                          emacs-oni-gui
-                          emacs-oni-magit
-                          emacs-oni-project
-                          emacs-oni-bookmark
-                          emacs-oni-dired
-                          emacs-oni-browse-url
-                          emacs-oni-c
-                          emacs-oni-circe
-                          emacs-oni-conf
-                          emacs-oni-css
-                          emacs-oni-diff-hl
-                          emacs-oni-ediff
-                          emacs-oni-eww
-                          emacs-oni-grep
-                          emacs-oni-highlight-indent-guides
-                          emacs-oni-html
-                          emacs-oni-json
-                          emacs-oni-log-edit
-                          emacs-oni-lua
-                          emacs-oni-makefile
-                          emacs-oni-nxml
-                          emacs-oni-package
-                          emacs-oni-projectile
-                          emacs-oni-scheme
-                          emacs-oni-sh
-                          emacs-oni-shr
-                          emacs-oni-tramp
-                          emacs-oni-embrace
-                          emacs-oni-git-commit
-                          emacs-oni-python
-                          emacs-oni-yaml
-                          emacs-oni-gnus))
+  #:use-module (oni packages emacs-config)
   #:use-module (oni packages pick-random-wallpaper))
 
 (home-environment
  (packages (append
             foreign-distro-compatibility-packages
-            (list (specification->package+output "font-fantasque-sans")
-                  (specification->package+output "font-comic-neue")
-                  (specification->package "fuzzel")
-                  (specification->package "wezterm")
-                  (specification->package "signal-desktop")
-                  (specification->package "openssh")
-                  (specification->package "keepassxc")
-                  font-dosis
+            (map specification->package '("font-fantasque-sans"
+                                          "font-comic-neue"
+                                          "fuzzel"
+                                          "wezterm"
+                                          "signal-desktop"
+                                          "openssh"
+                                          "keepassxc"
+                                          "font-dosis"
+                                          "swaybg"))
+            (list
                   pick-random-wallpaper
                   emacs-org-contacts
                   emacs-syncthing-status