1 files changed, 51 insertions, 54 deletions
diff --git a/.config/guix/modules/desktop.scm b/.config/guix/modules/desktop.scm
index 84371f4..55a78df 100644
--- a/.config/guix/modules/desktop.scm
+++ b/.config/guix/modules/desktop.scm
@@ -9,60 +9,22 @@
   #:use-module (gnu home services)
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services shells)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages suckless)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu services)
-  #:use-module (gnu services admin)
-  #:use-module (gnu services audio)
-  #:use-module (gnu services avahi)
-  #:use-module (gnu services dbus)
-  #:use-module (gnu services desktop)
-  #:use-module (gnu services networking)
-  #:use-module (gnu services sound)
-  #:use-module (gnu services xorg)
   #:use-module (guix gexp)
   #:use-module (guix packages)
   #:export (bd-desktop-system-packages
             bd-desktop-system-services
             bd-desktop-home-services))
 
-(define programs
-  '(
-    "dmenu"
-    "flameshot"
-    "font-google-noto-emoji"
-    "fontconfig"
-    "gimp"
-    "icecat"
-    "imagemagick"
-    "libnotify"
-    "librewolf"
-    "mpv"
-    "pavucontrol"
-    "picom"
-    "pulseaudio"
-    "sxiv"
-    "xprop"
-    "zathura"
-    "zathura-pdf-mupdf"
-    ))
+(use-service-modules admin audio avahi dbus
+                     desktop networking
+                     sound xorg)
 
-(define x-server
-  '(
-    "feh"
-    "ffmpeg"
-    "gtk+"
-    "font-terminus"
-    "xdotool"
-    "xf86-input-libinput"
-    "xf86-video-fbdev"
-    "xinit"
-    "xmodmap"
-    "xorg-server"
-    "xrdb"
-    "xset"
-    ))
+(use-package-modules compton fonts fontutils
+                     gimp gnome gnuzilla gtk
+                     image imagemagick
+                     image-viewers librewolf
+                     pdf pulseaudio suckless
+                     video xdisorg xorg)
 
 (define dwm-package
   (package
@@ -71,14 +33,49 @@
    (inputs (modify-inputs (package-inputs dwm)))
    (source (local-file "dwm" #:recursive? #t))))
 
+(define programs
+  (list
+   dmenu
+   flameshot
+   font-google-noto-emoji
+   fontconfig
+   gimp
+   icecat
+   imagemagick
+   libnotify
+   librewolf
+   mpv
+   pavucontrol
+   picom
+   pulseaudio
+   sxiv
+   xprop
+   zathura
+   zathura-pdf-mupdf
+   ))
+
+(define x-server
+  (list
+   dwm-package
+   feh
+   ffmpeg
+   gtk+
+   font-terminus
+   xdotool
+   xf86-input-libinput
+   xf86-video-fbdev
+   xinit
+   xmodmap
+   xorg-server
+   xrdb
+   xset
+   ))
+
 (define bd-desktop-system-packages
-  `(,@(map specification->package
-           (append!
-            programs
-            x-server
-            ))
-    ,dwm-package
-    ))
+  (append!
+   programs
+   x-server
+   ))
 
 (define bd-desktop-system-services
   (list