guix-config

guix system configuration/declaration
git clone git://git.eonn.xyz/guix-config.git
Log | Files | Refs | LICENSE

commit e55bbbebe816e8e7980ec4072255c99ad28d083c
parent e2e838e2f210b049e0ea882a873316887f380fd7
Author: Ian Ressa <ian@eonn.xyz>
Date:   Fri, 19 Aug 2022 16:31:42 -0400

Using alezost's specifications->packages instead of map specification->package; replace font-terminus with font-termsyn

Diffstat:
Mmodules/eonn/guix/packages.scm | 263++++++++++++++++++++++++++++++++++++++++---------------------------------------
Amodules/eonn/guix/utils.scm | 21+++++++++++++++++++++
2 files changed, 153 insertions(+), 131 deletions(-)

diff --git a/modules/eonn/guix/packages.scm b/modules/eonn/guix/packages.scm @@ -1,5 +1,5 @@ (define-module (eonn guix packages) - #:use-module (gnu packages) + #:use-module (eonn guix utils) #:export (build-common-packages system-packages xorg-packages @@ -16,159 +16,160 @@ virtualization-packages)) (define build-common-packages - (map specification->package - '("autoconf" - "automake" - "gcc-toolchain" - "gdb" - "gettext" - "make" - "pkg-config"))) + (specifications->packages + "autoconf" + "automake" + "gcc-toolchain" + "gdb" + "gettext" + "make" + "pkg-config")) (define system-packages - (map specification->package - '("acpi" - "acpid" - "nss-certs"))) + (specifications->packages + "acpi" + "acpid" + "nss-certs")) (define xorg-packages - (map specification->package - '("mesa" - "xorg-server" - "xf86-input-evdev" - "xf86-input-libinput" - "xf86-video-fbdev" - "xf86-video-vesa" - "xinit"))) + (specifications->packages + "mesa" + "xorg-server" + "xf86-input-evdev" + "xf86-input-libinput" + "xf86-video-fbdev" + "xf86-video-vesa" + "xinit")) (define xorg-misc-packages - (map specification->package - '("fontconfig" - "setxkbmap" - "xrandr" - "xrdb" - "xset" - "xsetroot" - "xev" - "xinput" - "xlsfonts" - "xmodmap"))) + (specifications->packages + "fontconfig" + "setxkbmap" + "xrandr" + "xrdb" + "xset" + "xsetroot" + "xev" + "xinput" + "xlsfonts" + "xmodmap")) (define desktop-packages - (map specification->package - '("dbus" - "dconf" - "dmenu-eonn" - "dunst" - "dwm-eonn" - "evince" - "feh" - "geeqie" - "gnome-keyring" - "icecat" - "keepassxc" - "mpv" - "mousepad" - "mumble" - "polkit-gnome" - "polybar" - "pulseaudio" - "pavucontrol" - "picom" - "pinentry" - "scrot" - "st-eonn" - "stumpwm" - "libreoffice" - "pcmanfm" - "xarchiver" - "xlockmore"))) + (specifications->packages + "dbus" + "dconf" + "dmenu-eonn" + "dunst" + "dwm-eonn" + "evince" + "feh" + "geeqie" + "gnome-keyring" + "icecat" + "keepassxc" + "mpv" + "mousepad" + "mumble" + "polkit-gnome" + "polybar" + "pulseaudio" + "pavucontrol" + "picom" + "pinentry" + "scrot" + "st-eonn" + "stumpwm" + "libreoffice" + "pcmanfm" + "xarchiver" + "xlockmore")) (define tools-packages - (map specification->package - '("aspell" - "aspell-dict-en" - "cmus" - "cpio" - "curl" - "ffmpeg" - "file" - "git" - "gnupg" - "htop" - "light" - "lsof" - "lm-sensors" - "markdown" - "neomutt" - "newsboat" - "openssh" - "rsync" - "tmux" - "weechat" - "unzip" - "vim" - "wget" - "youtube-dl" - "zip"))) + (specifications->packages + "aspell" + "aspell-dict-en" + "cmus" + "cpio" + "curl" + "ffmpeg" + "file" + "git" + "gnupg" + "htop" + "light" + "lsof" + "lm-sensors" + "markdown" + "neomutt" + "newsboat" + "openssh" + "rsync" + "tmux" + "weechat" + "unzip" + "vim" + "wget" + "youtube-dl" + "zip")) (define texlive-packages - (map specification->package - '("texlive" - "texlive-pgf"))) + (specifications->packages + "texlive" + "texlive-pgf")) (define font-packages - (map specification->package - '("font-dejavu" - "font-gnu-freefont" - "font-liberation" - "font-misc-misc" - "font-openmoji" - "font-terminus" - "font-ghostscript" - "unicode-emoji"))) + (specifications->packages + "font-dejavu" + "font-gnu-freefont" + "font-liberation" + "font-misc-misc" + "font-openmoji" + "font-termsyn" + "font-termsyn:psf" + "font-termsyn:otf" + "font-ghostscript" + "unicode-emoji")) (define theme-packages - (map specification->package - '("greybird-gtk-theme" - "delft-icon-theme" - "hackneyed-x11-cursors"))) + (specifications->packages + "greybird-gtk-theme" + "delft-icon-theme" + "hackneyed-x11-cursors")) (define emacs-packages - (map specification->package - '("emacs" - "emacs-auctex" - "emacs-auto-dictionary-mode" - "emacs-chess" - "emacs-geiser" - "emacs-guix" - "emacs-magit" - "emacs-markdown-mode" - "emacs-paredit" - "emacs-yasnippet"))) + (specifications->packages + "emacs" + "emacs-auctex" + "emacs-auto-dictionary-mode" + "emacs-chess" + "emacs-geiser" + "emacs-guix" + "emacs-magit" + "emacs-markdown-mode" + "emacs-paredit" + "emacs-yasnippet")) (define clisp-packages - (map specification->package - '("sbcl" - "cl-asdf"))) + (specifications->packages + "sbcl" + "cl-asdf")) (define python-packages - (map specification->package - '("python" - "python-dbus" - "python-distro"))) - + (specifications->packages + "python" + "python-dbus" + "python-distro")) (define games-packages - (map specification->package - '("0ad" - "supertuxkart" ;; :^) - "xonotic"))) + (specifications->packages + "0ad" + "supertuxkart" ;; :^) + "xonotic")) (define virtualization-packages - (map specification->package - '("qemu" - "virt-manager" - "virt-viewer" - "libvirt" - "libvirt-glib"))) + (specifications->packages + "qemu" + "virt-manager" + "virt-viewer" + "libvirt" + "libvirt-glib")) diff --git a/modules/eonn/guix/utils.scm b/modules/eonn/guix/utils.scm @@ -0,0 +1,21 @@ +(define-module (eonn guix utils) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (guix packages) + #:use-module (guix profiles) + #:use-module (gnu packages) + #:export (specifications->packages)) + +(define (spec->package spec) + "Like `specification->package' but better." + (let-values (((package output) + (specification->package+output spec))) + (match output + ("out" package) + (_ (list package output))))) + +(define-syntax-rule (specifications->packages spec ...) + "Return PACKAGES matching SPEC specifications. +This is a plural form of `specification->package'." + (map spec->package (list spec ...)))