Remove specification->package

1 files changed, 83 insertions, 71 deletions

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