Segregate xorg packages

3 files changed, 63 insertions, 46 deletions

diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 7f35e44..c512ab6 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -24,16 +24,37 @@
 (use-service-modules base file-sharing
                      networking ssh)
 
-(use-package-modules gnupg mail password-utils
-                     bittorrent pdf video
-                     cryptsetup curl emacs
-                     version-control web admin
-                     databases rsync
-                     package-management
-                     texlive compression vim)
-
-
-(define comm
+(use-package-modules
+ admin ;; netcat
+ bittorrent ;; transmission
+ compression ;; unzip
+ cryptsetup ;; cryptsetup
+ curl ;; curl
+ databases ;; recutils
+ emacs ;; emacs
+ fonts ;; font-google-noto-emoji, font-terminus
+ fontutils ;; fontconfig
+ gimp ;; gimp
+ gnupg ;; gnupg, pinentry,
+ gnuzilla ;; icecat
+ gtk ;; gtk+
+ imagemagick ;; imagemagick
+ librewolf ;; librewolf
+ mail ;; notmuch, offlineimap
+ package-management ;; stow
+ password-utils ;; pass-otp, password-store
+ pdf ;; xpdf, zathura, zathura-pdf-mupdf
+ rsync ;; rsync
+ texlive ;; texlive
+ version-control ;; git
+ video ;; ffmpeg, mpv
+ video ;; yt-dlp
+ vim ;; vim
+ web ;; jq
+ )
+
+
+(define base
   (list
    gnupg
    notmuch
@@ -44,10 +65,7 @@
    transmission
    xpdf                                 ; pdftotext
    yt-dlp
-   ))
 
-(define dev
-  (list
    cryptsetup
    curl
    emacs
@@ -62,10 +80,26 @@
    vim
    ))
 
+(define desk
+  (list
+   ffmpeg
+   fontconfig
+   font-google-noto-emoji
+   font-terminus
+   gimp
+   gtk+
+   icecat
+   imagemagick
+   librewolf
+   mpv
+   zathura
+   zathura-pdf-mupdf
+   ))
+
 (define bd-base-system-packages
   (append!
-   comm
-   dev
+   base
+   desk
    %base-packages
    ))
 
diff --git a/.config/guix/modules/desktop.scm b/.config/guix/modules/xorg.scm
index de07aa2..dd3f994 100644
--- a/.config/guix/modules/desktop.scm
+++ b/.config/guix/modules/xorg.scm
@@ -4,7 +4,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (modules desktop)
+(define-module (modules xorg)
   #:use-module (gnu)
   #:use-module (gnu home services)
   #:use-module (gnu home services desktop)
@@ -19,12 +19,16 @@
                      desktop networking
                      sound xorg)
 
-(use-package-modules compton fonts fontutils
-                     gimp gnome gnuzilla gtk
-                     image imagemagick
-                     image-viewers librewolf
-                     pdf pulseaudio suckless
-                     video xdisorg xorg)
+(use-package-modules
+ image ;; flameshot,
+ suckless ;; dmenu,
+ gnome ;; libnotify,
+ pulseaudio ;; pavucontrol, pulseaudio,
+ compton ;; picom
+ image-viewers ;; sxiv, feh
+ xorg ;; xprop, xf86-input-libinput, xf86-video-fbdev, xinit...
+ xdisorg ;; xdotool
+ )
 
 (define dwm-package
   (package
@@ -33,34 +37,19 @@
    (inputs (modify-inputs (package-inputs dwm)))
    (source (local-file "dwm" #:recursive? #t))))
 
-(define programs
+(define bd-desktop-system-packages
   (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
@@ -71,12 +60,6 @@
    xset
    ))
 
-(define bd-desktop-system-packages
-  (append!
-   programs
-   x-server
-   ))
-
 (define bd-desktop-system-services
   (list
    (service screen-locker-service-type
diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index 517c199..3e2acfc 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -14,9 +14,9 @@
   #:use-module (gnu services guix)
   #:use-module (guix gexp)
   #:use-module (modules base)
-  #:use-module (modules desktop)
   #:use-module (modules mpd)
-  #:use-module (modules ymir))
+  #:use-module (modules ymir)
+  #:use-module (modules xorg))
 
 
 (define home