Remove specification->package

7 files changed, 182 insertions, 173 deletions

diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm
index 1e8878a..f714c54 100644
--- a/.config/guix/hati.scm
+++ b/.config/guix/hati.scm
@@ -11,6 +11,7 @@
   #:use-module (gnu home services)
   #:use-module (gnu home services syncthing)
   #:use-module (gnu packages)
+  #:use-module (gnu packages xorg)
   #:use-module (gnu services)
   #:use-module (gnu services guix)
   #:use-module (guix gexp)
@@ -35,10 +36,10 @@
   `(,@bd-base-system-packages
     ,@bd-desktop-system-packages
     ,@bd-mpd-package
-    ,@(map specification->package
-           '(
-             "xf86-video-nouveau"
-             ))))
+
+    ;; machine-specific packages
+    ,@(list
+       xf86-video-nouveau)))
 
  (services
   `(,@bd-base-system-services
diff --git a/.config/guix/kvasir.scm b/.config/guix/kvasir.scm
index e0dcba6..520368c 100644
--- a/.config/guix/kvasir.scm
+++ b/.config/guix/kvasir.scm
@@ -35,10 +35,10 @@
    (packages
     `(,@bd-base-system-packages
       ,@bd-desktop-system-packages
-      ,@(map specification->package
-             '(
-               "brightnessctl"
-               ))))
+
+      ;; machine-specific packages
+      ,@(list
+         brightnessctl)))
 
    (services
     `(,@bd-base-system-services
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 8e91cde..e701035 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -6,6 +6,7 @@
 
 
 (define-module (base)
+  #:use-module (gnu)
   #:use-module (gnu home services)
   #:use-module (gnu home services dict)
   #:use-module (gnu home services gnupg)
@@ -13,88 +14,94 @@
   #:use-module (gnu home services shepherd)
   #:use-module (gnu home services ssh)
   #:use-module (gnu home services xdg)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages gnupg)
-  #:use-module (gnu services)
-  #:use-module (gnu services base)
-  #:use-module (gnu services file-sharing)
-  #:use-module (gnu services networking)
-  #:use-module (gnu services ssh)
   #:use-module (gnu system)
   #:use-module (guix gexp)
   #:export (bd-base-system-packages
             bd-base-system-services
             bd-base-home-services))
 
+(use-service-modules base file-sharing
+                     networking ssh)
+
+(use-package-modules aspell gnupg mail
+                     password-utils bittorrent
+                     pdf video cryptsetup
+                     curl emacs version-control
+                     web admin databases rsync
+                     lisp package-management
+                     texlive compression vim
+                     emacs-xyz)
 
 
 (define comm
-  '(
-    "aspell"
-    "aspell-dict-en"
-    "gnupg"
-    "notmuch"
-    "offlineimap3"
-    "pass-otp"
-    "password-store"
-    "pinentry"
-    "transmission"
-    "xpdf" ; pdftotext
-    "yt-dlp"
-    ))
+  (list
+   aspell
+   aspell-dict-en
+   gnupg
+   notmuch
+   offlineimap3
+   pass-otp
+   password-store
+   pinentry
+   transmission
+   xpdf ; pdftotext
+   yt-dlp
+   ))
 
 (define dev
-  '(
-    "cryptsetup"
-    "curl"
-    "emacs"
-    "git"
-    "jq"
-    "netcat"
-    "recutils"
-    "rsync"
-    "sbcl"
-    "stow"
-    "texlive"
-    "unzip"
-    "vim"
-    ))
+  (list
+   cryptsetup
+   curl
+   emacs
+   git
+   jq
+   netcat
+   recutils
+   rsync
+   sbcl
+   stow
+   texlive
+   unzip
+   vim
+   ))
 
 (define emacs
-  '(
-    "emacs-all-the-icons"
-    "emacs-all-the-icons-dired"
-    "emacs-auctex"
-    "emacs-consult"
-    "emacs-ef-themes"
-    "emacs-emms"
-    "emacs-guix"
-    "emacs-htmlize"
-    "emacs-magit"
-    "emacs-marginalia"
-    "emacs-notmuch"
-    "emacs-orderless"
-    "emacs-org-roam"
-    "emacs-paredit"
-    "emacs-popper"
-    "emacs-rainbow-delimiters"
-    "emacs-rainbow-mode"
-    "emacs-shackle"
-    "emacs-simple-httpd"
-    "emacs-slime"
-    "emacs-transmission"
-    "emacs-vertico"
-    "emacs-visual-fill-column"
-    ))
+  (list
+   emacs-all-the-icons
+   emacs-all-the-icons-dired
+   emacs-auctex
+   emacs-consult
+   emacs-ef-themes
+   emacs-emms
+   emacs-f
+   emacs-guix
+   emacs-htmlize
+   emacs-hydra
+   emacs-loop
+   emacs-magit
+   emacs-marginalia
+   emacs-notmuch
+   emacs-orderless
+   emacs-org-roam
+   emacs-paredit
+   emacs-popper
+   emacs-rainbow-delimiters
+   emacs-rainbow-mode
+   emacs-shackle
+   emacs-simple-httpd
+   emacs-slime
+   emacs-transmission
+   emacs-vertico
+   emacs-visual-fill-column
+   ))
 
 (define bd-base-system-packages
-  `(,@(map specification->package
-           (append!
-            comm
-            dev
-            emacs
-            ))
-    ,@%base-packages))
+  (append!
+   comm
+   dev
+   emacs
+   %base-packages
+   ))
 
 (define bd-base-system-services
   `(,(service openssh-service-type
@@ -140,11 +147,16 @@
              (bashrc (list (plain-file "bashrc" "
 # converts above aliases into eshell aliases automatically
 alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g;\" >~/.config/emacs/eshell/alias
-
-# add my scripts to path
-PATH=${HOME}/.local/bin:$PATH")))
+")))
              (environment-variables
-              '(("BROWSER" . "icecat")))))
+              '(
+                ("BROWSER" . "icecat")
+
+                ("VISUAL" . "emacsclient")
+                ("EDITOR" . "emacsclient")
+
+                ("PATH" . "$HOME/.local/bin:$PATH")
+                ))))
 
    (service home-openssh-service-type
             (home-openssh-configuration
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
diff --git a/.config/guix/modules/mpd.scm b/.config/guix/modules/mpd.scm
index 3c17b3e..45f8b76 100644
--- a/.config/guix/modules/mpd.scm
+++ b/.config/guix/modules/mpd.scm
@@ -1,5 +1,5 @@
 (define-module (mpd)
-  #:use-module (gnu packages)
+  #:use-module (gnu packages mpd)
   #:use-module (gnu services)
   #:use-module (gnu services audio)
   #:use-module (ymir)
@@ -8,14 +8,13 @@
 
 
 (define bd-mpd-package
-  `(,@(map specification->package
-           '(
-             ;; if the user can't access mpd directly,
-             ;; emms will fail to parse the supported
-             ;; file types :)
-             "mpd"
-             "mpd-mpc"
-             ))))
+  (list
+   ;; if the user can't access mpd directly,
+   ;; emms will fail to parse the supported
+   ;; file types :)
+   mpd
+   mpd-mpc
+   ))
 
 (define bd-mpd-service
   (list
diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm
index 5b4a01d..a46e2da 100644
--- a/.config/guix/modules/ymir.scm
+++ b/.config/guix/modules/ymir.scm
@@ -26,33 +26,33 @@
 
 (define ymir
   (operating-system
-    (host-name "ymir")
-    (locale "en_US.utf8")
-    (timezone "America/Denver")
-    (keyboard-layout (keyboard-layout "us"))
-    (kernel-arguments
-     (list
-      "quiet"))
+   (host-name "ymir")
+   (locale "en_US.utf8")
+   (timezone "America/Denver")
+   (keyboard-layout (keyboard-layout "us"))
+   (kernel-arguments
+    (list
+     "quiet"))
 
-    ;; 'root' is implicit
-    (users (cons* user
-                  %base-user-accounts))
+   ;; 'root' is implicit
+   (users (cons* user
+                 %base-user-accounts))
 
-    ;; grub (uefi)
-    (bootloader (bootloader-configuration
-                 (bootloader grub-efi-bootloader)
-                 (targets (list "/boot/efi"))
-                 (keyboard-layout keyboard-layout)))
+   ;; grub (uefi)
+   (bootloader (bootloader-configuration
+                (bootloader grub-efi-bootloader)
+                (targets (list "/boot/efi"))
+                (keyboard-layout keyboard-layout)))
 
-    ;; OVERRIDE THESE
-    (packages
-     %base-packages)
-    (services
-     %base-services)
-    (file-systems (cons*
-                   (file-system
-                     (mount-point "/")
-                     (device "none")
-                     (type "tmpfs")
-                     (check? #f))
-                   %base-file-systems))))
+   ;; OVERRIDE THESE
+   (packages
+    %base-packages)
+   (services
+    %base-services)
+   (file-systems (cons*
+                  (file-system
+                   (mount-point "/")
+                   (device "none")
+                   (type "tmpfs")
+                   (check? #f))
+                  %base-file-systems))))
diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index 8552228..e6c05df 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -35,10 +35,10 @@
   `(,@bd-base-system-packages
     ,@bd-desktop-system-packages
     ,@bd-mpd-package
-    ,@(map specification->package
-           '(
-             "brightnessctl"
-             ))))
+
+    ;; machine-specific packages
+    ,@(list
+       brightnessctl)))
 
  (services
   `(,@bd-base-system-services