From 79338c28b1b979c9d4943ada4bd45f9f869b39f9 Mon Sep 17 00:00:00 2001 From: Luis Guilherme Coelho Date: Thu, 26 Sep 2024 11:29:04 -0300 Subject: [PATCH] home-environments: radio: Move packages to a separate (radio packages) module --- home-environments/radio.scm | 188 +----------- home-environments/radio/packages.scm | 285 ++++++++++++++++++ .../radio/packages/emacs-xyz.scm | 120 -------- 3 files changed, 289 insertions(+), 304 deletions(-) create mode 100644 home-environments/radio/packages.scm delete mode 100644 home-environments/radio/packages/emacs-xyz.scm diff --git a/home-environments/radio.scm b/home-environments/radio.scm index bb50f6e..ce524c5 100644 --- a/home-environments/radio.scm +++ b/home-environments/radio.scm @@ -9,54 +9,8 @@ #:prefix user-) #|GNU packages|# - #|A|# #:use-module (gnu packages admin) - #|B|# #:use-module (gnu packages bittorrent) - #:use-module (gnu packages browser-extensions) - #|C|# #:use-module (gnu packages c) - #:use-module (gnu packages calendar) - #:use-module (gnu packages chromium) - #:use-module (gnu packages commencement) - #:use-module (gnu packages curl) - #|D|# #:use-module (gnu packages databases) - #|F|# #:use-module (gnu packages file) - #:use-module (gnu packages fonts) - #:use-module (gnu packages freedesktop) - #|G|# #:use-module (gnu packages glib) - #:use-module (gnu packages games) - #:use-module (gnu packages gnu-doc) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages guile-xyz) - #|H|# #:use-module (gnu packages haskell) - #:use-module (gnu packages haskell-xyz) - #:use-module (gnu packages haskell-apps) - #|I|# #:use-module (gnu packages image) - #:use-module (gnu packages image-viewers) - #:use-module (gnu packages irc) + #|G|# #:use-module (gnu packages gnupg) #|L|# #:use-module (gnu packages linux) - #|M|# #:use-module (gnu packages maths) - #:use-module (gnu packages mail) - #:use-module (gnu packages messaging) - #:use-module (gnu packages minetest) - #|O|# #:use-module (gnu packages ocr) - #|P|# #:use-module (gnu packages password-utils) - #:use-module (gnu packages pdf) - #:use-module (gnu packages perl) - #|S|# #:use-module (gnu packages scheme) - #:use-module (gnu packages shells) - #:use-module (gnu packages ssh) - #:use-module (gnu packages suckless) - #|T|# #:use-module (gnu packages telegram) - #:use-module (gnu packages terminals) - #:use-module (gnu packages tex) - #:use-module (gnu packages text-editors) - #:use-module (gnu packages tmux) - #:use-module (gnu packages toys) - #|V|# #:use-module (gnu packages version-control) - #:use-module (gnu packages video) - #|W|# #:use-module (gnu packages wm) - #|X|# #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xorg) - #|Z|# #:use-module (gnu packages zig-xyz) #|GNU home services|# #|•|# #:use-module (gnu home services) @@ -74,28 +28,14 @@ #|Radio|# #|C|# #:use-module ((radio channels) #:prefix channel:) + #|P|# #:use-module ((radio packages) #:prefix packages:) #|Radix|# #|C|# #:use-module (radix combinators) #|U|# #:use-module (radix utils) - + #|Radix packages|# - #|B|# #:use-module (radix packages browser-extensions) - #|D|# #:use-module (radix packages disk) - #|I|# #:use-module (radix packages image-viewers) #|F|# #:use-module (radix packages fish-xyz) - #:use-module (radix packages freedesktop) - #:use-module (radix packages fonts) - #|G|# #:use-module (radix packages games) - #|P|# #:use-module (radix packages pdf) - #:use-module (radix packages pulseaudio) - #|S|# #:use-module (radix packages seninha) - #:use-module (radix packages syndication) - #|T|# #:use-module (radix packages text-editors) - #:use-module (radix packages toys) - #|W|# #:use-module (radix packages wm) - #|V|# #:use-module (radix packages video) - #|X|# #:use-module (radix packages xdisorg) #|Radix home services|# #|•|# #:use-module (radix home services) @@ -111,27 +51,7 @@ application:reader application:shell application:terminal - application:wm - - packages:blogging - packages:calendar - packages:databases - packages:desktop - packages:development - packages:documentation - packages:downloads - packages:file-managing - packages:fonts - packages:games - packages:guix-contrib - packages:haskell - packages:image - packages:messaging - packages:password - packages:scheme - packages:sound - packages:video - packages:web)) + application:wm)) #|Default applications|# (define application:browser "chromium") @@ -141,106 +61,6 @@ (define application:terminal "footclient -D ~") (define application:wm "river") -#|Package lists|# -(define packages:blogging - (list #|guile-xyz|# haunt)) - -(define packages:calendar - (list #|calendar|# remind)) - -(define packages:databases - (list #|databases|# recutils)) - -(define packages:desktop - (list #|admin |# fastfetch - #|freedesktop|# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr - xdg-terminal-exec - #|glib |# dbus - #|image |# grim slurp - #|terminals |# foot - #|toys |# wayneko - #|wm |# fnott rivercarro riverguile river-bnf swww waybar - #|xdisorg |# fuzzel wl-clipboard wlrctl wlsunset - #|zig-xyz |# river)) - -(define packages:development - (list #|gnupg |# gnupg pinentry - #|math |# libqalculate - #|ssh |# openssh - #|perl |# perl ; dep for some kakoune functionality - #|text-editors |# kakoune kak-lsp kak-tree-sitter - #|tmux |# tmux - #|vesion-control|# diff-so-fancy git)) - -(define packages:documentation - (list #|c |# c-intro-and-ref - #|gnu-doc|# gnu-standards - #|scheme |# r7rs-small-texinfo sicp)) - -(define packages:downloads - (list #|bittorrent|# aria2 qbittorrent - #|curl |# curl - #|video |# yt-dlp)) - -(define packages:file-managing - (list #|disk |# lf - #|file |# file - #|haskell-xyz |# pandoc - #|image-viewers|# chafa - #|pdf |# img2pdf poppler - #|seninha |# fmutils - #|video |# ffmpegthumbnailer)) - -(define packages:fonts - (list #|base |# glibc-utf8-locales - #|fonts|# font-awesome font-google-noto font-google-noto-emoji - font-juliamono font-liberation font-meslo-lg-dz - font-misc-misc font-un font-wqy-zenhei)) - -(define packages:games - (list #|games|# minetest red-eclipse srb2 supertuxkart xonotic)) - -(define packages:guix-contrib - (list #|mail |# mumi - #|version-control|# git `(,git "send-email"))) - -(define packages:image - (list #|image-viewers|# imv - #|ocr |# tesseract-ocr)) - -(define packages:messaging - (list #|telegram |# telegram-desktop - #|mail |# neomutt)) - -(define packages:password - (list #|password-utils|# keepassxc)) - -(define packages:reading - (list #|pdf |# sioyek/wayland - #|syndication|# newsraft)) - -(define packages:scheme - (list #|guile-xyz|# guile-goblins guile-hoot guile-lib guile-srfi-197 - guile-srfi-232)) - -(define packages:haskell - (list #|commencement|# gcc-toolchain - #|haskell |# ghc - #|haskell-xyz |# ghc-async ghc-base-prelude ghc-basement - ghc-basic-prelude ghc-chart ghc-groups - #|haskell-apps|# hoogle)) - -(define packages:sound - (list #|linux |# wireplumber-minimal - #|pulseaudio|# ncpamixer)) - -(define packages:video - (list #|video|# ffmpeg mpv-minimal/wayland)) - -(define packages:web - (list #|chromium |# ungoogled-chromium/wayland - #|browser-extensions|# darkreader/chromium ublock-origin/chromium)) - (define home-environment (user-home-environment (packages diff --git a/home-environments/radio/packages.scm b/home-environments/radio/packages.scm new file mode 100644 index 0000000..9b346b8 --- /dev/null +++ b/home-environments/radio/packages.scm @@ -0,0 +1,285 @@ +(define-module (radio packages) + #|GNU packages|# + #|A|# #:use-module (gnu packages admin) + #|B|# #:use-module (gnu packages bittorrent) + #:use-module (gnu packages browser-extensions) + #|C|# #:use-module (gnu packages c) + #:use-module (gnu packages calendar) + #:use-module (gnu packages chromium) + #:use-module (gnu packages commencement) + #:use-module (gnu packages curl) + #|D|# #:use-module (gnu packages databases) + #|E|# #:use-module (gnu packages emacs) + #:use-module (gnu packages emacs-xyz) + #|F|# #:use-module (gnu packages file) + #:use-module (gnu packages fonts) + #:use-module (gnu packages freedesktop) + #|G|# #:use-module (gnu packages glib) + #:use-module (gnu packages games) + #:use-module (gnu packages gnu-doc) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages guile-xyz) + #|H|# #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages haskell-apps) + #|I|# #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages image-viewers) + #:use-module (gnu packages irc) + #|L|# #:use-module (gnu packages linux) + #|M|# #:use-module (gnu packages maths) + #:use-module (gnu packages mail) + #:use-module (gnu packages messaging) + #:use-module (gnu packages minetest) + #|O|# #:use-module (gnu packages ocr) + #|P|# #:use-module (gnu packages password-utils) + #:use-module (gnu packages pdf) + #:use-module (gnu packages perl) + #|S|# #:use-module (gnu packages scheme) + #:use-module (gnu packages shells) + #:use-module (gnu packages ssh) + #:use-module (gnu packages suckless) + #|T|# #:use-module (gnu packages telegram) + #:use-module (gnu packages terminals) + #:use-module (gnu packages tex) + #:use-module (gnu packages text-editors) + #:use-module (gnu packages tmux) + #:use-module (gnu packages toys) + #|V|# #:use-module (gnu packages version-control) + #:use-module (gnu packages video) + #|W|# #:use-module (gnu packages wm) + #|X|# #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) + #|Z|# #:use-module (gnu packages zig-xyz) + + #|Radix packages|# + #|B|# #:use-module (radix packages browser-extensions) + #|D|# #:use-module (radix packages disk) + #|I|# #:use-module (radix packages image-viewers) + #|E|# #:use-module (radix packages emacs-xyz) + #|F|# #:use-module (radix packages fish-xyz) + #:use-module (radix packages freedesktop) + #:use-module (radix packages fonts) + #|G|# #:use-module (radix packages games) + #|P|# #:use-module (radix packages pdf) + #:use-module (radix packages pulseaudio) + #|S|# #:use-module (radix packages seninha) + #:use-module (radix packages syndication) + #|T|# #:use-module (radix packages text-editors) + #:use-module (radix packages toys) + #|W|# #:use-module (radix packages wm) + #|V|# #:use-module (radix packages video) + #|X|# #:use-module (radix packages xdisorg) + + #:export (blogging + calendar + databases + desktop + development + documentation + downloads + emacs + file-managing + fonts + games + guix-contrib + haskell + image + messaging + password + reading + scheme + sound + video + web)) + +(define blogging + (list #|guile-xyz|# haunt)) + +(define calendar + (list #|calendar|# remind)) + +(define databases + (list #|databases|# recutils)) + +(define desktop + (list #|admin |# fastfetch + #|freedesktop|# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr + xdg-terminal-exec + #|glib |# dbus + #|image |# grim slurp + #|terminals |# foot + #|toys |# wayneko + #|wm |# fnott rivercarro riverguile river-bnf swww waybar + #|xdisorg |# fuzzel wl-clipboard wlrctl wlsunset + #|zig-xyz |# river)) + +(define development + (list #|gnupg |# gnupg pinentry + #|math |# libqalculate + #|ssh |# openssh + #|perl |# perl ; dep for some kakoune functionality + #|text-editors |# kakoune kak-lsp kak-tree-sitter + #|tmux |# tmux + #|vesion-control|# diff-so-fancy git)) + +(define documentation + (list #|c |# c-intro-and-ref + #|gnu-doc|# gnu-standards + #|scheme |# r7rs-small-texinfo sicp)) + +(define downloads + (list #|bittorrent|# aria2 qbittorrent + #|curl |# curl + #|video |# yt-dlp)) + +(define file-managing + (list #|disk |# lf + #|file |# file + #|haskell-xyz |# pandoc + #|image-viewers|# chafa + #|pdf |# img2pdf poppler + #|seninha |# fmutils + #|video |# ffmpegthumbnailer)) + +(define fonts + (list #|fonts|# font-awesome font-google-noto font-google-noto-emoji + font-juliamono font-liberation font-meslo-lg-dz + font-misc-misc font-un font-wqy-zenhei)) + +(define games + (list #|games|# minetest #|red-eclipse|# srb2 supertuxkart #|xonotic|#)) + +(define guix-contrib + (list #|mail |# mumi + #|version-control|# git `(,git "send-email"))) + +(define image + (list #|image-viewers|# imv + #|ocr |# tesseract-ocr)) + +(define messaging + (list #|telegram |# telegram-desktop + #|mail |# neomutt)) + +(define password + (list #|password-utils|# keepassxc)) + +(define reading + (list #|pdf |# sioyek/wayland + #|syndication|# newsraft)) + +(define scheme + (list #|guile-xyz|# guile-goblins guile-hoot guile-lib guile-srfi-197 + guile-srfi-232)) + +(define haskell + (list #|commencement|# gcc-toolchain + #|haskell |# ghc + #|haskell-xyz |# ghc-async ghc-base-prelude ghc-basement + ghc-basic-prelude ghc-chart ghc-groups + #|haskell-apps|# hoogle)) + +(define sound + (list #|linux |# wireplumber-minimal + #|pulseaudio|# ncpamixer)) + +(define video + (list #|video|# ffmpeg mpv-minimal/wayland)) + +(define web + (list #|chromium |# ungoogled-chromium/wayland + #|browser-extensions|# darkreader/chromium ublock-origin/chromium)) + +(define emacs:base + (list emacs-next-pgtk + emacs-no-littering + emacs-centaur-tabs + emacs-helpful)) + +(define emacs:modeline + (list emacs-diminish)) + +(define emacs:completion + (list emacs-anzu emacs-cape emacs-corfu emacs-corfu-doc emacs-consult-lsp + emacs-marginalia emacs-orderless emacs-vertico)) + +(define emacs:file-managing + (list emacs-dirvish emacs-dired-hide-dotfiles emacs-all-the-icons imagemagick)) + +(define emacs:ide + (list emacs-magit emacs-hl-fill-column emacs-origami-el)) + +(define emacs:guile + (list emacs-arei guile-ares-rs emacs-macrostep-geiser emacs-geiser-eros + emacs-flycheck emacs-flycheck-guile emacs-lispy emacs-rainbow-delimiters + emacs-lispyville emacs-isayt emacs-puni)) + +(define emacs:guix + (cons emacs-guix emacs:guile)) + +(define emacs:haskell + (list emacs-haskell-mode emacs-dante)) + +(define emacs:themes + (list emacs-ef-themes)) + +;; https://github.com/oantolin/embark ? +(define emacs:modal-editing + (list emacs-meow + emacs-zones emacs-expand-region emacs-ryo-modal emacs-visual-regexp + emacs-undo-tree + emacs-selected emacs-crux)) + +(define emacs:misc + (list emacs-osm emacs-pulsar)) + +(define emacs:communication + (list emacs-circe emacs-notmuch)) + +(define emacs:mathematics + (list emacs-lean4-mode)) + +(define emacs:org + (list emacs-org-auto-tangle emacs-org-bullets emacs-org-fragtog emacs-org-present + emacs-org-roam emacs-org-modern emacs-olivetti)) ;emacs-org-pdftools + +(define emacs:studying + (list emacs-gnosis + emacs-hyperbole + emacs-pdf-tools + emacs-saveplace-pdf-view)) + +(define emacs:social-media + (list emacs-mastodon)) + +(define emacs:terminal + (list emacs-eat)) + +(define emacs:writing + (list emacs-auctex emacs-latex-preview-pane)) + +(define emacs:blogging + (cons* emacs-ox-haunt + emacs:writing)) + +(define emacs + (append emacs:base + emacs:blogging + emacs:completion + emacs:communication + emacs:file-managing + emacs:guile + emacs:guix + emacs:haskell + emacs:ide + emacs:mathematics + emacs:misc + emacs:modal-editing + emacs:modeline + emacs:org + emacs:studying + emacs:social-media + emacs:terminal + emacs:themes + emacs:writing)) diff --git a/home-environments/radio/packages/emacs-xyz.scm b/home-environments/radio/packages/emacs-xyz.scm deleted file mode 100644 index 7744188..0000000 --- a/home-environments/radio/packages/emacs-xyz.scm +++ /dev/null @@ -1,120 +0,0 @@ -(define-module (radio packages emacs-xyz) - #:use-module (gnu packages emacs) - #:use-module (gnu packages emacs-xyz) - #:use-module (gnu packages guile-xyz) - #:use-module (gnu packages haskell-apps) - #:use-module (gnu packages imagemagick) - #:use-module (gnu packages mail) - #:use-module (radix packages emacs-xyz) - #:export (packages:emacs - packages:all - packages:blogging - packages:completion - packages:file-managing - packages:guile - packages:guix - packages:haskell - packages:mathematics - packages:misc - packages:modal-editing - packages:org - packages:social-media - packages:terminal - packages:writing)) - -;; https://github.com/rougier/svg-lib - -(define packages:emacs - (list emacs-next-pgtk - emacs-no-littering - emacs-centaur-tabs - emacs-helpful)) - -(define packages:modeline - (list emacs-diminish)) - -(define packages:completion - (list emacs-anzu emacs-cape emacs-corfu emacs-corfu-doc emacs-consult-lsp - emacs-marginalia emacs-orderless emacs-vertico)) - -(define packages:file-managing - (list emacs-dirvish emacs-dired-hide-dotfiles emacs-all-the-icons imagemagick)) - -(define packages:ide - (list emacs-magit emacs-hl-fill-column emacs-origami-el)) - -(define packages:guile - (list emacs-arei guile-ares-rs emacs-macrostep-geiser emacs-geiser-eros - emacs-flycheck emacs-flycheck-guile emacs-lispy emacs-rainbow-delimiters - emacs-lispyville emacs-isayt emacs-puni)) - -(define packages:guix - (cons emacs-guix packages:guile)) - -(define packages:haskell - (list emacs-haskell-mode emacs-dante)) - -(define packages:themes - (list emacs-ef-themes)) - -;; https://github.com/oantolin/embark ? -(define packages:modal-editing - (list emacs-meow - #|emkaks|# emacs-zones emacs-expand-region emacs-ryo-modal - emacs-visual-regexp emacs-undo-tree - emacs-selected emacs-crux)) - -(define packages:misc - (list #|maps |# emacs-osm - #|pulsar |# emacs-pulsar)) - -(define packages:communication - (list #|irc |# emacs-circe - #|mail|# emacs-notmuch)) - -(define packages:mathematics - (list emacs-lean4-mode)) - -(define packages:org - (list emacs-org-auto-tangle emacs-org-bullets emacs-org-fragtog emacs-org-present - emacs-org-roam emacs-org-modern emacs-olivetti)) ;emacs-org-pdftools - -(define packages:studying - (list emacs-gnosis - emacs-hyperbole - emacs-pdf-tools - emacs-saveplace-pdf-view)) - -(define packages:social-media - (list emacs-mastodon)) - -(define packages:terminal - (list emacs-eat)) - -(define packages:writing - (list emacs-auctex emacs-latex-preview-pane)) - -(define packages:blogging - (cons* emacs-ox-haunt - packages:writing)) - -(define packages:all - (append packages:emacs - packages:blogging - packages:completion - packages:communication - packages:file-managing - packages:guile - packages:guix - packages:haskell - packages:ide - packages:mathematics - packages:misc - packages:modal-editing - packages:modeline - packages:org - packages:studying - packages:social-media - packages:terminal - packages:themes - packages:writing))