From 53c757521a3ab5f3198383e325321ead2a70adaf Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 7 Feb 2026 17:08:42 +0800 Subject: [PATCH] maint: Update REUSE.toml, adjust SPDX headers and module imports. --- .guix-authorizations | 3 -- .guix-channel | 3 -- NEWS | 3 +- README.org | 2 +- REUSE.toml | 19 ++++++++++ etc/manifests/all-packages.scm | 3 +- etc/manifests/auto-update.scm | 3 +- etc/manifests/manual-update.scm | 3 +- etc/manifests/rosenthal-auto-update.scm | 5 ++- modules/guix/import/rosenthal-updaters.scm | 6 ++-- modules/rosenthal.scm | 3 +- modules/rosenthal/bootloader/grub.scm | 5 +-- modules/rosenthal/bootloader/uki.scm | 4 +++ modules/rosenthal/ci/tarball.scm | 12 ++++--- .../rosenthal/examples/emacs/init-editing.el | 3 -- .../rosenthal/examples/emacs/init-fonts.el | 7 ---- .../examples/emacs/init-interface.el | 3 -- .../examples/emacs/init-miscellaneous.el | 3 -- modules/rosenthal/examples/emacs/init.el | 3 -- modules/rosenthal/examples/emacs/install.sh | 3 -- modules/rosenthal/examples/mako.conf | 4 --- modules/rosenthal/examples/niri.kdl | 4 --- .../rosenthal/examples/waybar/config.jsonc | 3 -- modules/rosenthal/examples/waybar/style.css | 3 -- modules/rosenthal/packages/admin.scm | 13 ++++--- modules/rosenthal/packages/animation.scm | 20 ++++++----- modules/rosenthal/packages/binaries.scm | 22 +++++++----- modules/rosenthal/packages/bootloaders.scm | 9 +++-- .../rosenthal/packages/browser-extensions.scm | 11 +++--- modules/rosenthal/packages/busybox.scm | 5 +-- modules/rosenthal/packages/ci.scm | 10 +++--- modules/rosenthal/packages/dns.scm | 12 ++++--- modules/rosenthal/packages/emacs-xyz.scm | 13 ++++--- modules/rosenthal/packages/games.scm | 6 +++- modules/rosenthal/packages/golang.scm | 11 ++++-- modules/rosenthal/packages/messaging.scm | 17 +++++---- modules/rosenthal/packages/networking.scm | 18 +++++----- .../rosenthal/packages/package-management.scm | 7 ++-- modules/rosenthal/packages/password-utils.scm | 7 ++-- modules/rosenthal/packages/python-xyz.scm | 27 +++++++------- modules/rosenthal/packages/rust-apps.scm | 13 ++++--- modules/rosenthal/packages/rust-crates.scm | 7 ++-- modules/rosenthal/packages/ssh.scm | 5 +-- modules/rosenthal/packages/tree-sitter.scm | 4 +-- modules/rosenthal/packages/video.scm | 5 +-- modules/rosenthal/packages/web.scm | 14 ++++---- modules/rosenthal/packages/wm.scm | 11 +++--- modules/rosenthal/packages/xorg.scm | 13 ++++--- modules/rosenthal/services/base.scm | 8 ++--- modules/rosenthal/services/bittorrent.scm | 15 +++++--- modules/rosenthal/services/child-error.scm | 24 +++++++------ modules/rosenthal/services/cuirass.scm | 17 ++++----- modules/rosenthal/services/desktop.scm | 18 +++++----- modules/rosenthal/services/dns.scm | 8 +++-- modules/rosenthal/services/file-systems.scm | 15 ++++---- modules/rosenthal/services/keyboard.scm | 5 +-- modules/rosenthal/services/mail.scm | 24 +++++++------ modules/rosenthal/services/messaging.scm | 19 +++++----- modules/rosenthal/services/monitoring.scm | 9 +++-- modules/rosenthal/services/networking.scm | 20 ++++++----- modules/rosenthal/services/shellutils.scm | 13 ++++--- modules/rosenthal/services/web.scm | 35 ++++++++++--------- modules/rosenthal/utils/cargo.scm | 5 +-- modules/rosenthal/utils/download.scm | 5 +-- modules/rosenthal/utils/file.scm | 2 ++ modules/rosenthal/utils/packages.scm | 9 +++-- modules/rosenthal/utils/predicates.scm | 1 + modules/rosenthal/utils/serializers.scm | 11 +++--- modules/rosenthal/utils/serializers/ini.scm | 14 ++++---- modules/rosenthal/utils/serializers/yaml.scm | 21 ++++++----- modules/rosenthal/utils/transformations.scm | 5 +++ pre-inst-env | 3 -- 72 files changed, 391 insertions(+), 305 deletions(-) diff --git a/.guix-authorizations b/.guix-authorizations index ca881fc..b144af3 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -1,7 +1,4 @@ ;;; -*- mode: scheme -*- -;;; SPDX-FileCopyrightText: 2022, 2024 Hilton Chain -;;; -;;; SPDX-License-Identifier: CC0-1.0 (authorizations (version 0) diff --git a/.guix-channel b/.guix-channel index edee448..7040227 100644 --- a/.guix-channel +++ b/.guix-channel @@ -1,7 +1,4 @@ ;; -*- mode: scheme -*- -;; SPDX-FileCopyrightText: 2022, 2023, 2025 Hilton Chain -;; -;; SPDX-License-Identifier: CC0-1.0 (channel (version 0) diff --git a/NEWS b/NEWS index bb88867..44d6ff1 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,6 @@ ;; -*- mode: scheme -*- -;; SPDX-FileCopyrightText: 2023, 2024 Hilton Chain -;; ;; SPDX-License-Identifier: GPL-3.0-or-later +;; Copyright © 2023, 2024 Hilton Chain (channel-news (version 0) diff --git a/README.org b/README.org index 3edf4fc..7457ee4 100644 --- a/README.org +++ b/README.org @@ -1,5 +1,5 @@ -# SPDX-FileCopyrightText: 2022, 2024, 2025-2026 Hilton Chain # SPDX-License-Identifier: CC0-1.0 +# Copyright © 2022, 2024, 2025-2026 Hilton Chain #+TITLE: Rosenthal - A certain Guix channel #+html: diff --git a/REUSE.toml b/REUSE.toml index 0f142ab..9a6f22d 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -1,5 +1,24 @@ version = 1 +[[annotations]] +path = [ + ".guix-authorizations", + ".guix-channel", + "pre-inst-env", + ] +SPDX-FileCopyrightText = "" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["modules/**"] +SPDX-FileCopyrightText = "" +SPDX-License-Identifier = "GPL-3.0-or-later" + +[[annotations]] +path = ["modules/rosenthal/examples/**"] +SPDX-FileCopyrightText = "" +SPDX-License-Identifier = "CC0-1.0" + [[annotations]] path = ["modules/rosenthal/examples/wallpaper.jpg"] SPDX-FileCopyrightText = "Copyright © 2023 Hilton Chain " diff --git a/etc/manifests/all-packages.scm b/etc/manifests/all-packages.scm index e16611d..deec940 100644 --- a/etc/manifests/all-packages.scm +++ b/etc/manifests/all-packages.scm @@ -1,6 +1,5 @@ -;; SPDX-FileCopyrightText: 2025 Hilton Chain -;; ;; SPDX-License-Identifier: CC0-1.0 +;; Copyright © 2025 Hilton Chain (use-modules (guix profiles) (rosenthal utils packages)) diff --git a/etc/manifests/auto-update.scm b/etc/manifests/auto-update.scm index 54ec3a1..49378e2 100644 --- a/etc/manifests/auto-update.scm +++ b/etc/manifests/auto-update.scm @@ -1,6 +1,5 @@ -;; SPDX-FileCopyrightText: 2025 Hilton Chain -;; ;; SPDX-License-Identifier: CC0-1.0 +;; Copyright © 2025 Hilton Chain (use-modules (guix profiles) (rosenthal utils packages)) diff --git a/etc/manifests/manual-update.scm b/etc/manifests/manual-update.scm index 1bae80a..ec6abf5 100644 --- a/etc/manifests/manual-update.scm +++ b/etc/manifests/manual-update.scm @@ -1,6 +1,5 @@ -;; SPDX-FileCopyrightText: 2025 Hilton Chain -;; ;; SPDX-License-Identifier: CC0-1.0 +;; Copyright © 2025 Hilton Chain (use-modules (guix packages) (guix profiles) diff --git a/etc/manifests/rosenthal-auto-update.scm b/etc/manifests/rosenthal-auto-update.scm index 277ac3e..bc21506 100644 --- a/etc/manifests/rosenthal-auto-update.scm +++ b/etc/manifests/rosenthal-auto-update.scm @@ -1,7 +1,6 @@ -;;; SPDX-FileCopyrightText: 2024-2025 Ludovic Courtès -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2024-2025 Ludovic Courtès +;;; Copyright © 2025 Hilton Chain (use-modules (guix memoization) (guix packages) diff --git a/modules/guix/import/rosenthal-updaters.scm b/modules/guix/import/rosenthal-updaters.scm index 37a95f2..5db0b52 100644 --- a/modules/guix/import/rosenthal-updaters.scm +++ b/modules/guix/import/rosenthal-updaters.scm @@ -1,11 +1,11 @@ -;;; SPDX-FileCopyrightText: 2024, 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2024, 2025 Hilton Chain (define-module (guix import rosenthal-updaters) + ;; Guile builtins #:use-module (srfi srfi-71) #:use-module (web client) - + ;; Utilities #:use-module (guix packages) #:use-module (guix records) #:use-module (guix upstream) diff --git a/modules/rosenthal.scm b/modules/rosenthal.scm index b3632ef..9e2c09b 100644 --- a/modules/rosenthal.scm +++ b/modules/rosenthal.scm @@ -1,6 +1,5 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal)) diff --git a/modules/rosenthal/bootloader/grub.scm b/modules/rosenthal/bootloader/grub.scm index f485154..a34bad6 100644 --- a/modules/rosenthal/bootloader/grub.scm +++ b/modules/rosenthal/bootloader/grub.scm @@ -1,10 +1,11 @@ -;;; SPDX-FileCopyrightText: 2023 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2023 Hilton Chain (define-module (rosenthal bootloader grub) + ;; Guix System - bootloaders #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) + ;; Guix packages #:use-module (rosenthal packages bootloaders) #:export (grub-efi-luks2-bootloader grub-efi-luks2-removable-bootloader)) diff --git a/modules/rosenthal/bootloader/uki.scm b/modules/rosenthal/bootloader/uki.scm index 2b813de..677a4fe 100644 --- a/modules/rosenthal/bootloader/uki.scm +++ b/modules/rosenthal/bootloader/uki.scm @@ -3,11 +3,15 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later (define-module (rosenthal bootloader uki) + ;; Guile builtins #:use-module (srfi srfi-1) + ;; Utilities #:use-module (guix gexp) #:use-module (guix modules) #:use-module (guix utils) + ;; Guix System - bootloaders #:use-module (gnu bootloader) + ;; Guix packages #:use-module (rosenthal packages bootloaders) #:export (uefi-uki-removable-bootloader)) diff --git a/modules/rosenthal/ci/tarball.scm b/modules/rosenthal/ci/tarball.scm index 7f172db..a29d534 100644 --- a/modules/rosenthal/ci/tarball.scm +++ b/modules/rosenthal/ci/tarball.scm @@ -1,18 +1,20 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal ci tarball) + ;; Guile builtins #:use-module (srfi srfi-1) + ;; Utilities + #:use-module (gnu ci) + #:use-module (gnu compression) #:use-module (guix derivations) #:use-module (guix gexp) #:use-module (guix monads) #:use-module (guix packages) #:use-module (guix profiles) - #:use-module (guix store) #:use-module (guix scripts pack) - #:use-module (gnu ci) - #:use-module (gnu compression) + #:use-module (guix store) + ;; Guix packages #:use-module (rosenthal packages package-management) #:export (cuirass-jobs)) diff --git a/modules/rosenthal/examples/emacs/init-editing.el b/modules/rosenthal/examples/emacs/init-editing.el index 2a1a35c..44a691b 100644 --- a/modules/rosenthal/examples/emacs/init-editing.el +++ b/modules/rosenthal/examples/emacs/init-editing.el @@ -1,7 +1,4 @@ ;;; -*- lexical-binding: t -*- -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; -;;; SPDX-License-Identifier: GPL-3.0-or-later (use-package emacs :custom diff --git a/modules/rosenthal/examples/emacs/init-fonts.el b/modules/rosenthal/examples/emacs/init-fonts.el index 2a544ba..b485fa7 100644 --- a/modules/rosenthal/examples/emacs/init-fonts.el +++ b/modules/rosenthal/examples/emacs/init-fonts.el @@ -1,11 +1,4 @@ ;;; -*- lexical-binding: t -*- -;;; SPDX-FileCopyrightText: DogLooksGood -;;; SPDX-FileCopyrightText: 2022 Nyk Ma -;;; -;;; SPDX-License-Identifier: GPL-3.0-or-later - -;; https://github.com/DogLooksGood/meomacs/blob/master/laf.org -;; https://github.com/nykma/nema/blob/develop/my-sample/font.el ;;guix:font-adobe-source-serif ;;guix:font-google-noto-emoji diff --git a/modules/rosenthal/examples/emacs/init-interface.el b/modules/rosenthal/examples/emacs/init-interface.el index 99cfbc5..354e3a8 100644 --- a/modules/rosenthal/examples/emacs/init-interface.el +++ b/modules/rosenthal/examples/emacs/init-interface.el @@ -1,7 +1,4 @@ ;;; -*- lexical-binding: t -*- -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; -;;; SPDX-License-Identifier: GPL-3.0-or-later (use-package emacs :custom diff --git a/modules/rosenthal/examples/emacs/init-miscellaneous.el b/modules/rosenthal/examples/emacs/init-miscellaneous.el index d1610ec..6cec99c 100644 --- a/modules/rosenthal/examples/emacs/init-miscellaneous.el +++ b/modules/rosenthal/examples/emacs/init-miscellaneous.el @@ -1,7 +1,4 @@ ;;; -*- lexical-binding: t -*- -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; -;;; SPDX-License-Identifier: GPL-3.0-or-later ;;guix:emacs-daemons (use-package daemons diff --git a/modules/rosenthal/examples/emacs/init.el b/modules/rosenthal/examples/emacs/init.el index 99d286b..84da504 100644 --- a/modules/rosenthal/examples/emacs/init.el +++ b/modules/rosenthal/examples/emacs/init.el @@ -1,7 +1,4 @@ ;;; -*- lexical-binding: t -*- -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; -;;; SPDX-License-Identifier: GPL-3.0-or-later (setopt custom-file (locate-user-emacs-file "custom.el")) (if (not (file-exists-p custom-file)) diff --git a/modules/rosenthal/examples/emacs/install.sh b/modules/rosenthal/examples/emacs/install.sh index 52f26ed..7f52d3f 100755 --- a/modules/rosenthal/examples/emacs/install.sh +++ b/modules/rosenthal/examples/emacs/install.sh @@ -1,7 +1,4 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2026 Hilton Chain -# -# SPDX-License-Identifier: CC0-1.0 grep --recursive --no-filename '^;;guix:' . | sed --regexp-extended 's/^;;guix:(.*)/"\1"/g' | diff --git a/modules/rosenthal/examples/mako.conf b/modules/rosenthal/examples/mako.conf index da15878..60fbf93 100644 --- a/modules/rosenthal/examples/mako.conf +++ b/modules/rosenthal/examples/mako.conf @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: 2025 Hilton Chain -# -# SPDX-License-Identifier: CC0-1.0 - font=monospace 11 text-color=#13181B background-color=#D2DEE9E0 diff --git a/modules/rosenthal/examples/niri.kdl b/modules/rosenthal/examples/niri.kdl index f840c0b..886c9c0 100644 --- a/modules/rosenthal/examples/niri.kdl +++ b/modules/rosenthal/examples/niri.kdl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023-2025 Ivan Molodetskikh -// -// SPDX-License-Identifier: GPL-3.0-or-later - // This config is in the KDL format: https://kdl.dev // "/-" comments out the following node. // Check the wiki for a full description of the configuration: diff --git a/modules/rosenthal/examples/waybar/config.jsonc b/modules/rosenthal/examples/waybar/config.jsonc index 0633b18..42268c6 100644 --- a/modules/rosenthal/examples/waybar/config.jsonc +++ b/modules/rosenthal/examples/waybar/config.jsonc @@ -1,7 +1,4 @@ // -*- mode: jsonc -*- -// SPDX-FileCopyrightText: 2025 Hilton Chain -// -// SPDX-License-Identifier: CC0-1.0 { "layer": "top", diff --git a/modules/rosenthal/examples/waybar/style.css b/modules/rosenthal/examples/waybar/style.css index 723d4b8..fc2eb44 100644 --- a/modules/rosenthal/examples/waybar/style.css +++ b/modules/rosenthal/examples/waybar/style.css @@ -1,6 +1,3 @@ -/* SPDX-FileCopyrightText: 2025 Hilton Chain */ -/* SPDX-License-Identifier: CC0-1.0 */ - @define-color bg1 #D2DEE9; @define-color bg2 #13181B; diff --git a/modules/rosenthal/packages/admin.scm b/modules/rosenthal/packages/admin.scm index f352985..78b1580 100644 --- a/modules/rosenthal/packages/admin.scm +++ b/modules/rosenthal/packages/admin.scm @@ -1,18 +1,21 @@ -;;; SPDX-FileCopyrightText: 2022, 2025 Hilton Chain -;;; SPDX-FileCopyrightText: 2025 William Goodspeed -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022, 2025 Hilton Chain +;;; Copyright © 2025 William Goodspeed (define-module (rosenthal packages admin) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix git-download) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (rosenthal utils cargo) + ;; Guix origin methods + #:use-module (guix git-download) + ;; Guix build systems #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + ;; Guix packages #:use-module (gnu packages admin) #:use-module (gnu packages linux) #:use-module (gnu packages m4) diff --git a/modules/rosenthal/packages/animation.scm b/modules/rosenthal/packages/animation.scm index 1f34879..736f7a7 100644 --- a/modules/rosenthal/packages/animation.scm +++ b/modules/rosenthal/packages/animation.scm @@ -1,18 +1,20 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages animation) + ;; Utilities + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + ;; Guix origin methods + #:use-module (guix git-download) + ;; Guix build systems + #:use-module (guix build-system cmake) + ;; Guix packages #:use-module (gnu packages animation) #:use-module (gnu packages compression) - #:use-module (gnu packages image) - #:use-module (guix build-system cmake) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils)) - + #:use-module (gnu packages image)) (define-public lottie-converter (let ((commit "3ad34af7bbcf9197fda782a5832b18b72a3bb939") diff --git a/modules/rosenthal/packages/binaries.scm b/modules/rosenthal/packages/binaries.scm index abc29a1..9f48b44 100644 --- a/modules/rosenthal/packages/binaries.scm +++ b/modules/rosenthal/packages/binaries.scm @@ -1,17 +1,21 @@ -;;; SPDX-FileCopyrightText: 2023-2024 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2023-2024 Hilton Chain (define-module (rosenthal packages binaries) + ;; Guile builtins #:use-module (srfi srfi-1) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix gexp) - #:use-module (guix deprecation) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix build-system copy) + ;; Utilities #:use-module (gnu build icecat-extension) + #:use-module (guix deprecation) + #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + ;; Guix origin methods + #:use-module (guix download) + ;; Guix build systems + #:use-module (guix build-system copy) + ;; Guix packages #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bootstrap) diff --git a/modules/rosenthal/packages/bootloaders.scm b/modules/rosenthal/packages/bootloaders.scm index b2d1aca..3bdec1b 100644 --- a/modules/rosenthal/packages/bootloaders.scm +++ b/modules/rosenthal/packages/bootloaders.scm @@ -1,17 +1,20 @@ -;;; SPDX-FileCopyrightText: 2023-2025 Hilton Chain -;;; Copyright © 2024 Lilah Tascheter -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2023-2025 Hilton Chain +;;; Copyright © 2024 Lilah Tascheter (define-module (rosenthal packages bootloaders) + ;; Utilities #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + ;; Guix origin methods #:use-module (guix download) #:use-module (guix git-download) + ;; Guix build systems #:use-module (guix build-system meson) #:use-module (guix build-system pyproject) + ;; Guix packages #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bootloaders) diff --git a/modules/rosenthal/packages/browser-extensions.scm b/modules/rosenthal/packages/browser-extensions.scm index dec1612..76415ff 100644 --- a/modules/rosenthal/packages/browser-extensions.scm +++ b/modules/rosenthal/packages/browser-extensions.scm @@ -1,16 +1,19 @@ -;;; SPDX-FileCopyrightText: 2023-2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2023-2025 Hilton Chain (define-module (rosenthal packages browser-extensions) + ;; Guile builtins #:use-module (srfi srfi-1) + ;; Utilities + #:use-module (gnu build icecat-extension) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + ;; Guix origin methods #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build-system copy) - #:use-module (gnu build icecat-extension)) + ;; Guix build systems + #:use-module (guix build-system copy)) (define-public bitwarden (package diff --git a/modules/rosenthal/packages/busybox.scm b/modules/rosenthal/packages/busybox.scm index 838aa51..1eb0aef 100644 --- a/modules/rosenthal/packages/busybox.scm +++ b/modules/rosenthal/packages/busybox.scm @@ -1,11 +1,12 @@ -;;; SPDX-FileCopyrightText: 2022 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022 Hilton Chain (define-module (rosenthal packages busybox) + ;; Utilities #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) + ;; Guix packages #:use-module (gnu packages busybox)) (define-public busybox/static diff --git a/modules/rosenthal/packages/ci.scm b/modules/rosenthal/packages/ci.scm index efd84ae..cfdea1d 100644 --- a/modules/rosenthal/packages/ci.scm +++ b/modules/rosenthal/packages/ci.scm @@ -1,13 +1,15 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages ci) - #:use-module ((guix licenses) #:prefix license:) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix git-download) #:use-module (rosenthal utils packages) + ;; Guix origin methods + #:use-module (guix git-download) + ;; Guix packages #:use-module (gnu packages ci)) (define-public cuirass/dolly diff --git a/modules/rosenthal/packages/dns.scm b/modules/rosenthal/packages/dns.scm index 8c12656..c4e1935 100644 --- a/modules/rosenthal/packages/dns.scm +++ b/modules/rosenthal/packages/dns.scm @@ -1,13 +1,15 @@ -;;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022-2024 Hilton Chain (define-module (rosenthal packages dns) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system copy) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + ;; Guix origin methods #:use-module (guix git-download) - #:use-module (guix packages)) + ;; Guix build systems + #:use-module (guix build-system copy)) (define-public dnsmasq-china-list ;; No version. diff --git a/modules/rosenthal/packages/emacs-xyz.scm b/modules/rosenthal/packages/emacs-xyz.scm index 48e1a9d..6a2dea1 100644 --- a/modules/rosenthal/packages/emacs-xyz.scm +++ b/modules/rosenthal/packages/emacs-xyz.scm @@ -1,14 +1,17 @@ -;;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022-2024 Hilton Chain (define-module (rosenthal packages emacs-xyz) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system emacs) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + ;; Guix origin methods #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix packages) + ;; Guix build systems + #:use-module (guix build-system emacs) + ;; Guix packages #:use-module (gnu packages emacs-xyz)) (define-public emacs-caddyfile-mode diff --git a/modules/rosenthal/packages/games.scm b/modules/rosenthal/packages/games.scm index 59b477a..9f016d7 100644 --- a/modules/rosenthal/packages/games.scm +++ b/modules/rosenthal/packages/games.scm @@ -1,13 +1,17 @@ +;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright © 2022 Cairn ;;; Copyright © 2025 Carmine Margiotta ;;; Copyright © 2025 Noah Evans -;;; SPDX-License-Identifier: GPL-3.0-or-later (define-module (rosenthal packages games) + ;; Utilities #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + ;; Guix origin methods #:use-module (guix git-download) + ;; Guix build systems #:use-module (guix build-system cmake) + ;; Guix packages #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages gl) diff --git a/modules/rosenthal/packages/golang.scm b/modules/rosenthal/packages/golang.scm index 6687614..d512711 100644 --- a/modules/rosenthal/packages/golang.scm +++ b/modules/rosenthal/packages/golang.scm @@ -1,15 +1,22 @@ +;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain + (define-module (rosenthal packages golang) - #:use-module ((guix licenses) #:prefix license:) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (rosenthal utils cargo) + ;; Guix origin methods #:use-module (guix download) #:use-module (guix git-download) #:use-module (rosenthal utils download) - #:use-module (rosenthal utils cargo) + ;; Guix build systems #:use-module (guix build-system cargo) #:use-module (guix build-system copy) #:use-module (guix build-system go) + ;; Guix packages #:use-module (gnu packages golang) #:use-module (gnu packages image) #:use-module (gnu packages jemalloc) diff --git a/modules/rosenthal/packages/messaging.scm b/modules/rosenthal/packages/messaging.scm index c5212b4..2bdf754 100644 --- a/modules/rosenthal/packages/messaging.scm +++ b/modules/rosenthal/packages/messaging.scm @@ -1,9 +1,17 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages messaging) + ;; Utilities + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + ;; Guix origin methods + #:use-module (guix git-download) + ;; Guix build systems + #:use-module (guix build-system pyproject) + ;; Guix packages #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages monitoring) @@ -15,11 +23,6 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages serialization) #:use-module (gnu packages video) - #:use-module (guix build-system pyproject) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils) #:use-module (rosenthal packages animation) #:use-module (rosenthal packages python-xyz)) diff --git a/modules/rosenthal/packages/networking.scm b/modules/rosenthal/packages/networking.scm index 2d7fbb2..2c15537 100644 --- a/modules/rosenthal/packages/networking.scm +++ b/modules/rosenthal/packages/networking.scm @@ -1,21 +1,23 @@ -;;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022-2024 Hilton Chain (define-module (rosenthal packages networking) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system go) + ;; Utilities #:use-module (guix gexp) - #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (rosenthal utils download) #:use-module (rosenthal utils packages) + ;; Guix origin methods + #:use-module (guix git-download) + #:use-module (rosenthal utils download) + ;; Guix build systems + #:use-module (guix build-system go) + ;; Guix packages #:use-module (gnu packages base) #:use-module (gnu packages dns) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) - #:use-module (gnu packages linux) - #:use-module (rosenthal packages golang)) + #:use-module (gnu packages linux)) (define-public cloudflared (package diff --git a/modules/rosenthal/packages/package-management.scm b/modules/rosenthal/packages/package-management.scm index b16a4c1..08252a1 100644 --- a/modules/rosenthal/packages/package-management.scm +++ b/modules/rosenthal/packages/package-management.scm @@ -1,13 +1,14 @@ -;;; SPDX-FileCopyrightText: 2022, 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022, 2025 Hilton Chain (define-module (rosenthal packages package-management) - #:use-module ((guix licenses) #:prefix license:) + ;; Guix utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (rosenthal utils packages) + ;; Guix packages #:use-module (gnu packages package-management)) (define-public guix/dolly diff --git a/modules/rosenthal/packages/password-utils.scm b/modules/rosenthal/packages/password-utils.scm index c97c037..747a024 100644 --- a/modules/rosenthal/packages/password-utils.scm +++ b/modules/rosenthal/packages/password-utils.scm @@ -1,16 +1,19 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages password-utils) + ;; Utilities #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + ;; Guix origin methods #:use-module (guix download) #:use-module (guix git-download) #:use-module (rosenthal utils download) + ;; Guix build systems #:use-module (guix build-system go) + ;; Guix packages #:use-module (gnu packages golang)) (define-public sops diff --git a/modules/rosenthal/packages/python-xyz.scm b/modules/rosenthal/packages/python-xyz.scm index 9de2bbf..924de9e 100644 --- a/modules/rosenthal/packages/python-xyz.scm +++ b/modules/rosenthal/packages/python-xyz.scm @@ -1,9 +1,21 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages python-xyz) + ;; Utilities + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (rosenthal utils cargo) + ;; Guix build systems + #:use-module (guix build-system cargo) + #:use-module (guix build-system pyproject) + #:use-module (guix build-system python) + ;; Guix origin methods + #:use-module (guix download) + #:use-module (guix git-download) + ;; Guix packages #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) @@ -14,16 +26,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages rust) #:use-module (gnu packages serialization) - #:use-module (gnu packages time) - #:use-module (guix build-system cargo) - #:use-module (guix build-system pyproject) - #:use-module (guix build-system python) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (rosenthal utils cargo)) + #:use-module (gnu packages time)) (define-public python-coherent-licensed (package diff --git a/modules/rosenthal/packages/rust-apps.scm b/modules/rosenthal/packages/rust-apps.scm index e51cfcd..ef07dd6 100644 --- a/modules/rosenthal/packages/rust-apps.scm +++ b/modules/rosenthal/packages/rust-apps.scm @@ -1,14 +1,17 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages rust-apps) - #:use-module ((guix licenses) #:prefix license:) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system cargo) #:use-module (rosenthal utils cargo) + ;; Guix origin methods + #:use-module (guix git-download) + ;; Guix build systems + #:use-module (guix build-system cargo) + ;; Guix packages #:use-module (gnu packages sqlite)) (define-public atuin diff --git a/modules/rosenthal/packages/rust-crates.scm b/modules/rosenthal/packages/rust-crates.scm index 0be1e6b..6b429af 100644 --- a/modules/rosenthal/packages/rust-crates.scm +++ b/modules/rosenthal/packages/rust-crates.scm @@ -1,13 +1,16 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages rust-crates) + ;; Utilities #:use-module (guix packages) #:use-module (guix utils) + ;; Guix origin methods #:use-module (guix download) #:use-module (guix git-download) + ;; Guix build systems #:use-module (guix build-system cargo) + ;; Guix packages #:use-module (rosenthal packages wm) #:export (lookup-cargo-inputs)) diff --git a/modules/rosenthal/packages/ssh.scm b/modules/rosenthal/packages/ssh.scm index c71d3e5..54957e3 100644 --- a/modules/rosenthal/packages/ssh.scm +++ b/modules/rosenthal/packages/ssh.scm @@ -1,11 +1,12 @@ -;;; SPDX-FileCopyrightText: 2022 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022 Hilton Chain (define-module (rosenthal packages ssh) + ;; Utilities #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) + ;; Guix packages #:use-module (gnu packages compression) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ssh)) diff --git a/modules/rosenthal/packages/tree-sitter.scm b/modules/rosenthal/packages/tree-sitter.scm index faef24c..32daff2 100644 --- a/modules/rosenthal/packages/tree-sitter.scm +++ b/modules/rosenthal/packages/tree-sitter.scm @@ -1,7 +1,7 @@ -;;; SPDX-FileCopyrightText: 2023 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2023 Hilton Chain (define-module (rosenthal packages tree-sitter) + ;; Utilities #:use-module (guix gexp) #:use-module (guix packages)) diff --git a/modules/rosenthal/packages/video.scm b/modules/rosenthal/packages/video.scm index 4cb28a8..1863f22 100644 --- a/modules/rosenthal/packages/video.scm +++ b/modules/rosenthal/packages/video.scm @@ -1,11 +1,12 @@ -;;; SPDX-FileCopyrightText: 2022 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022 Hilton Chain (define-module (rosenthal packages video) + ;; Utilities #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) + ;; Guix packages #:use-module (gnu packages video)) (define-public libva-nox diff --git a/modules/rosenthal/packages/web.scm b/modules/rosenthal/packages/web.scm index 8e1b855..7cf4b78 100644 --- a/modules/rosenthal/packages/web.scm +++ b/modules/rosenthal/packages/web.scm @@ -1,25 +1,27 @@ -;;; SPDX-FileCopyrightText: 2022, 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022, 2025 Hilton Chain (define-module (rosenthal packages web) - #:use-module ((guix licenses) #:prefix license:) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (rosenthal utils cargo) + ;; Guix origin methods #:use-module (guix download) #:use-module (guix git-download) #:use-module (rosenthal utils download) - #:use-module (rosenthal utils cargo) + ;; Guix build systems #:use-module (guix build-system cargo) #:use-module (guix build-system copy) #:use-module (guix build-system go) + ;; Guix packages #:use-module (gnu packages golang) #:use-module (gnu packages image) #:use-module (gnu packages jemalloc) - #:use-module (gnu packages web) #:use-module (gnu packages version-control) - #:use-module (rosenthal packages golang)) + #:use-module (gnu packages web)) (define-public ai-robots-txt (package diff --git a/modules/rosenthal/packages/wm.scm b/modules/rosenthal/packages/wm.scm index 6454503..52e767a 100644 --- a/modules/rosenthal/packages/wm.scm +++ b/modules/rosenthal/packages/wm.scm @@ -1,15 +1,18 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages wm) - #:use-module ((guix licenses) #:prefix license:) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (rosenthal utils cargo) + ;; Guix origin methods #:use-module (guix git-download) + ;; Guix build systems #:use-module (guix build-system cargo) #:use-module (guix build-system copy) - #:use-module (rosenthal utils cargo) + ;; Guix packages #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages base) diff --git a/modules/rosenthal/packages/xorg.scm b/modules/rosenthal/packages/xorg.scm index 08e337a..7e4ca61 100644 --- a/modules/rosenthal/packages/xorg.scm +++ b/modules/rosenthal/packages/xorg.scm @@ -1,14 +1,17 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal packages xorg) - #:use-module ((guix licenses) #:prefix license:) + ;; Utilities #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system cargo) #:use-module (rosenthal utils cargo) + ;; Guix origin methods + #:use-module (guix git-download) + ;; Guix build systems + #:use-module (guix build-system cargo) + ;; Guix packages #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg)) diff --git a/modules/rosenthal/services/base.scm b/modules/rosenthal/services/base.scm index 9ee95c9..907f416 100644 --- a/modules/rosenthal/services/base.scm +++ b/modules/rosenthal/services/base.scm @@ -1,14 +1,14 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal services base) + ;; Utilities #:use-module (guix gexp) #:use-module (guix records) #:use-module (rosenthal utils packages) - + ;; Guix System - services #:use-module (gnu services base) - + ;; Guix packages #:use-module (gnu packages admin) #:use-module (gnu packages bash) #:use-module (rosenthal packages admin) diff --git a/modules/rosenthal/services/bittorrent.scm b/modules/rosenthal/services/bittorrent.scm index 91e9d9e..ffe44db 100644 --- a/modules/rosenthal/services/bittorrent.scm +++ b/modules/rosenthal/services/bittorrent.scm @@ -1,20 +1,25 @@ -;;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022, 2023 Hilton Chain (define-module (rosenthal services bittorrent) + ;; Guile builtins #:use-module (ice-9 format) + ;; Utilities #:use-module (guix gexp) #:use-module (guix records) #:use-module (rosenthal utils predicates) - #:use-module (gnu packages admin) - #:use-module (gnu packages bittorrent) + ;; Guix System + #:use-module (gnu system shadow) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services configuration) #:use-module (gnu services shepherd) + ;; Guix Home - services #:use-module (gnu home services) #:use-module (gnu home services shepherd) - #:use-module (gnu system shadow) + ;; Guix packages + #:use-module (gnu packages admin) + #:use-module (gnu packages bittorrent) #:export (qbittorrent-configuration qbittorrent-service-type home-qbittorrent-service-type)) diff --git a/modules/rosenthal/services/child-error.scm b/modules/rosenthal/services/child-error.scm index 2ceb7cb..18d088a 100644 --- a/modules/rosenthal/services/child-error.scm +++ b/modules/rosenthal/services/child-error.scm @@ -1,24 +1,28 @@ -;;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022, 2023 Hilton Chain (define-module (rosenthal services child-error) - #:use-module (guix records) + ;; Utilities #:use-module (guix gexp) - #:use-module (gnu home services) - #:use-module (gnu home services shepherd) - #:use-module (gnu packages admin) - #:use-module (gnu packages web) + #:use-module (guix records) + #:use-module (rosenthal utils predicates) + #:use-module (rosenthal utils serializers yaml) + ;; Guix System + #:use-module (gnu system shadow) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services configuration) #:use-module (gnu services databases) #:use-module (gnu services shepherd) - #:use-module (gnu system shadow) + ;; Guix Home - services + #:use-module (gnu home services) + #:use-module (gnu home services shepherd) + ;; Guix packages + #:use-module (gnu packages admin) + #:use-module (gnu packages web) #:use-module (rosenthal packages binaries) #:use-module (rosenthal packages networking) - #:use-module (rosenthal utils predicates) - #:use-module (rosenthal utils serializers yaml) #:export (clash-configuration clash-service-type diff --git a/modules/rosenthal/services/cuirass.scm b/modules/rosenthal/services/cuirass.scm index 764d100..58bb3ca 100644 --- a/modules/rosenthal/services/cuirass.scm +++ b/modules/rosenthal/services/cuirass.scm @@ -1,31 +1,32 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal services cuirass) + ;; Guile builtins #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) - + ;; Utilities #:use-module (guix gexp) #:use-module (guix modules) #:use-module (guix records) #:use-module (guix store) #:use-module (rosenthal utils packages) - - #:use-module (gnu bootloader) - #:use-module (gnu bootloader grub) + ;; Guix System #:use-module (gnu system) #:use-module (gnu system linux-container) #:use-module (gnu system file-systems) #:use-module (gnu system shadow) - + ;; Guix System - bootloaders + #:use-module (gnu bootloader) + #:use-module (gnu bootloader grub) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services base) #:use-module (gnu services cuirass) #:use-module (gnu services databases) #:use-module (gnu services shepherd) - + ;; Guix packages #:use-module (gnu packages linux) #:use-module (rosenthal packages ci) #:export (cuirass-worker-container-service-type diff --git a/modules/rosenthal/services/desktop.scm b/modules/rosenthal/services/desktop.scm index 53154e1..68459d3 100644 --- a/modules/rosenthal/services/desktop.scm +++ b/modules/rosenthal/services/desktop.scm @@ -1,22 +1,22 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal services desktop) + ;; Utilities + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix modules) #:use-module (guix packages) #:use-module (guix records) #:use-module (guix utils) - #:use-module (guix deprecation) #:use-module (rosenthal utils file) #:use-module (rosenthal utils packages) - + ;; Guix build systems #:use-module (guix build-system copy) - + ;; Guix System #:use-module (gnu system) #:use-module (gnu system shadow) - + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services configuration) @@ -25,13 +25,13 @@ #:use-module (gnu services sddm) #:use-module (gnu services xorg) #:use-module (rosenthal services base) - + ;; Guix Home - services #:use-module (gnu home) #:use-module (gnu home services) #:use-module (gnu home services desktop) #:use-module (gnu home services shepherd) #:use-module (gnu home services sound) - + ;; Guix packages #:use-module (gnu packages fcitx5) #:use-module (gnu packages fonts) #:use-module (gnu packages gnome) @@ -41,8 +41,6 @@ #:use-module (gnu packages wm) #:use-module (gnu packages xorg) #:use-module (rosenthal packages wm) - #:use-module (rosenthal packages xorg) - #:export (home-blueman-applet-configuration home-blueman-applet-service-type diff --git a/modules/rosenthal/services/dns.scm b/modules/rosenthal/services/dns.scm index 83f7745..ae62fb6 100644 --- a/modules/rosenthal/services/dns.scm +++ b/modules/rosenthal/services/dns.scm @@ -1,14 +1,16 @@ -;;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2022, 2023 Hilton Chain (define-module (rosenthal services dns) + ;; Utilities #:use-module (guix gexp) #:use-module (guix records) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services configuration) - #:use-module (gnu packages dns) #:use-module (gnu services shepherd) + ;; Guix packages + #:use-module (gnu packages dns) #:export (smartdns-configuration smartdns-service-type)) diff --git a/modules/rosenthal/services/file-systems.scm b/modules/rosenthal/services/file-systems.scm index 36d0067..8bc926c 100644 --- a/modules/rosenthal/services/file-systems.scm +++ b/modules/rosenthal/services/file-systems.scm @@ -1,20 +1,23 @@ -;;; SPDX-FileCopyrightText: 2024, 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2024, 2025 Hilton Chain (define-module (rosenthal services file-systems) + ;; Utilities #:use-module (guix gexp) #:use-module (guix records) - #:use-module (gnu packages backup) - #:use-module (gnu packages file-systems) - #:use-module (rosenthal packages admin) + ;; Guix System + #:use-module (gnu system pam) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services configuration) #:use-module (gnu services linux) #:use-module (gnu services mcron) #:use-module (gnu services shepherd) - #:use-module (gnu system pam) + ;; Guix packages + #:use-module (gnu packages backup) + #:use-module (gnu packages file-systems) + #:use-module (rosenthal packages admin) #:export (btrbk-service-type btrbk-configuration diff --git a/modules/rosenthal/services/keyboard.scm b/modules/rosenthal/services/keyboard.scm index fff944b..7ca993d 100644 --- a/modules/rosenthal/services/keyboard.scm +++ b/modules/rosenthal/services/keyboard.scm @@ -1,9 +1,10 @@ -;;; SPDX-FileCopyrightText: 2021 Andrew Tropin -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2021 Andrew Tropin (define-module (rosenthal services keyboard) + ;; Guix System #:use-module (gnu system keyboard) + ;; Guix Home - services #:use-module (gnu home services) #:export (home-keyboard-service-type)) diff --git a/modules/rosenthal/services/mail.scm b/modules/rosenthal/services/mail.scm index 8c108a9..28fa3f0 100644 --- a/modules/rosenthal/services/mail.scm +++ b/modules/rosenthal/services/mail.scm @@ -1,21 +1,25 @@ -;;; SPDX-FileCopyrightText: 2024, 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2024, 2025 Hilton Chain (define-module (rosenthal services mail) - #:use-module (gnu home services shepherd) - #:use-module (gnu home services) - #:use-module (gnu packages mail) + ;; Guile builtins + #:use-module (srfi srfi-26) + ;; Utilities + #:use-module (guix gexp) + #:use-module (guix records) + #:use-module (rosenthal utils serializers yaml) + ;; Guix System - services + #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services configuration) #:use-module (gnu services containers) #:use-module (gnu services docker) #:use-module (gnu services shepherd) - #:use-module (gnu services) - #:use-module (guix gexp) - #:use-module (guix records) - #:use-module (rosenthal utils serializers yaml) - #:use-module (srfi srfi-26) + ;; Guix Home - services + #:use-module (gnu home services) + #:use-module (gnu home services shepherd) + ;; Guix packages + #:use-module (gnu packages mail) #:export (docker-mailserver-configuration docker-mailserver-service-type diff --git a/modules/rosenthal/services/messaging.scm b/modules/rosenthal/services/messaging.scm index d0f15a4..8ff2823 100644 --- a/modules/rosenthal/services/messaging.scm +++ b/modules/rosenthal/services/messaging.scm @@ -1,18 +1,21 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal services messaging) - #:use-module (gnu services configuration) - #:use-module (gnu services databases) - #:use-module (gnu services shepherd) - #:use-module (gnu services) - #:use-module (gnu system shadow) + ;; Utilities #:use-module (guix gexp) #:use-module (guix modules) #:use-module (guix records) - #:use-module (rosenthal packages messaging) #:use-module (rosenthal utils predicates) + ;; Guix System + #:use-module (gnu system shadow) + ;; Guix System - services + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services databases) + #:use-module (gnu services shepherd) + ;; Guix packages + #:use-module (rosenthal packages messaging) #:export (heisenbridge-service-type heisenbridge-configuration diff --git a/modules/rosenthal/services/monitoring.scm b/modules/rosenthal/services/monitoring.scm index 4dab916..a66bc38 100644 --- a/modules/rosenthal/services/monitoring.scm +++ b/modules/rosenthal/services/monitoring.scm @@ -1,22 +1,25 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal services monitoring) + ;; Utilities #:use-module (guix gexp) #:use-module (guix modules) #:use-module (guix records) + #:use-module (rosenthal utils predicates) #:use-module (rosenthal utils serializers ini) #:use-module (rosenthal utils serializers yaml) + ;; Guix System #:use-module (gnu system shadow) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services configuration) #:use-module (gnu services databases) #:use-module (gnu services shepherd) + ;; Guix packages #:use-module (gnu packages guile-xyz) #:use-module (rosenthal packages binaries) - #:use-module (rosenthal utils predicates) #:export (alloy-configuration alloy-service-type diff --git a/modules/rosenthal/services/networking.scm b/modules/rosenthal/services/networking.scm index 5215c34..ad5620e 100644 --- a/modules/rosenthal/services/networking.scm +++ b/modules/rosenthal/services/networking.scm @@ -1,22 +1,26 @@ -;;; SPDX-FileCopyrightText: 2023 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2023 Hilton Chain (define-module (rosenthal services networking) - #:use-module (srfi srfi-1) + ;; Guile builtins #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + ;; Utilities #:use-module (guix gexp) #:use-module (guix records) - #:use-module (gnu packages linux) - #:use-module (gnu packages networking) - #:use-module (rosenthal packages networking) + #:use-module (rosenthal utils predicates) + ;; Guix System + #:use-module (gnu system shadow) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services configuration) #:use-module (gnu services dbus) #:use-module (gnu services shepherd) - #:use-module (gnu system shadow) - #:use-module (rosenthal utils predicates) + ;; Guix packages + #:use-module (gnu packages linux) + #:use-module (gnu packages networking) + #:use-module (rosenthal packages networking) #:export (sing-box-service-type sing-box-configuration diff --git a/modules/rosenthal/services/shellutils.scm b/modules/rosenthal/services/shellutils.scm index 8000600..a385194 100644 --- a/modules/rosenthal/services/shellutils.scm +++ b/modules/rosenthal/services/shellutils.scm @@ -1,27 +1,26 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal services shellutils) + ;; Guile builtins #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) - + ;; Utilities #:use-module (guix deprecation) #:use-module (guix diagnostics) #:use-module (guix gexp) #:use-module (guix i18n) #:use-module (guix records) #:use-module (rosenthal utils packages) - + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services configuration) - + ;; Guix Home - services #:use-module (gnu home services shells) - + ;; Guix packages #:use-module (gnu packages rust-apps) #:use-module (gnu packages shellutils) #:use-module (rosenthal packages rust-apps) - #:export (home-fish-plugin-atuin-service-type home-atuin-configuration diff --git a/modules/rosenthal/services/web.scm b/modules/rosenthal/services/web.scm index e70a3dc..8434f08 100644 --- a/modules/rosenthal/services/web.scm +++ b/modules/rosenthal/services/web.scm @@ -1,30 +1,33 @@ -;;; SPDX-FileCopyrightText: 2024 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2024 Hilton Chain (define-module (rosenthal services web) - #:use-module (gnu packages admin) - #:use-module (gnu packages guile-xyz) - #:use-module (gnu packages version-control) - #:use-module (gnu packages video) - #:use-module (gnu packages web) + ;; Utilities + #:use-module (guix gexp) + #:use-module (guix modules) + #:use-module (guix records) + #:use-module (rosenthal utils predicates) + #:use-module (rosenthal utils serializers ini) + #:use-module (rosenthal utils serializers yaml) + ;; Guix System + #:use-module (gnu system privilege) + #:use-module (gnu system shadow) + ;; Guix System - services + #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services configuration) #:use-module (gnu services containers) #:use-module (gnu services databases) #:use-module (gnu services docker) #:use-module (gnu services shepherd) - #:use-module (gnu services) - #:use-module (gnu system privilege) - #:use-module (gnu system shadow) - #:use-module (guix gexp) - #:use-module (guix modules) - #:use-module (guix records) + ;; Guix packages + #:use-module (gnu packages admin) + #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages version-control) + #:use-module (gnu packages video) + #:use-module (gnu packages web) #:use-module (rosenthal packages binaries) #:use-module (rosenthal packages web) - #:use-module (rosenthal utils predicates) - #:use-module (rosenthal utils serializers ini) - #:use-module (rosenthal utils serializers yaml) #:export (caddy-configuration caddy-service-type diff --git a/modules/rosenthal/utils/cargo.scm b/modules/rosenthal/utils/cargo.scm index 7a96e21..3e6eee8 100644 --- a/modules/rosenthal/utils/cargo.scm +++ b/modules/rosenthal/utils/cargo.scm @@ -1,9 +1,10 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal utils cargo) + ;; Guile builtins #:use-module (srfi srfi-26) + ;; Guix build systems #:use-module (guix build-system cargo) #:export (rosenthal-cargo-inputs)) diff --git a/modules/rosenthal/utils/download.scm b/modules/rosenthal/utils/download.scm index 2f2c249..5d5d61c 100644 --- a/modules/rosenthal/utils/download.scm +++ b/modules/rosenthal/utils/download.scm @@ -1,10 +1,11 @@ -;;; SPDX-FileCopyrightText: 2025 Hilton Chain -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Hilton Chain (define-module (rosenthal utils download) + ;; Utilities #:use-module (guix gexp) #:use-module (guix packages) + ;; Guix build systems #:use-module (guix build-system gnu) #:export (go-mod-vendor)) diff --git a/modules/rosenthal/utils/file.scm b/modules/rosenthal/utils/file.scm index b1c71a7..6173525 100644 --- a/modules/rosenthal/utils/file.scm +++ b/modules/rosenthal/utils/file.scm @@ -2,7 +2,9 @@ ;;; Copyright © 2025 Hilton Chain (define-module (rosenthal utils file) + ;; Guile builtins #:use-module (ice-9 textual-ports) + ;; Utilities #:use-module (guix gexp) #:export (computed-substitution-with-inputs file-content diff --git a/modules/rosenthal/utils/packages.scm b/modules/rosenthal/utils/packages.scm index ae5e809..0adc462 100644 --- a/modules/rosenthal/utils/packages.scm +++ b/modules/rosenthal/utils/packages.scm @@ -4,7 +4,10 @@ ;;; Copyright © 2025 Hilton Chain (define-module (rosenthal utils packages) - #:use-module (gnu packages) + ;; Guile builtins + #:use-module (ice-9 match) + #:use-module (srfi srfi-34) + ;; Utilities #:use-module (guix deprecation) #:use-module (guix diagnostics) #:use-module (guix discovery) @@ -12,8 +15,8 @@ #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix ui) - #:use-module (ice-9 match) - #:use-module (srfi srfi-34) + ;; Guix packages + #:use-module (gnu packages) #:replace (%patch-path search-patch) #:export (rosenthal-patches diff --git a/modules/rosenthal/utils/predicates.scm b/modules/rosenthal/utils/predicates.scm index 812f64a..3f250b7 100644 --- a/modules/rosenthal/utils/predicates.scm +++ b/modules/rosenthal/utils/predicates.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2025 Hilton Chain (define-module (rosenthal utils predicates) + ;; Utilities #:use-module (guix gexp) #:export (file-object? user-and-group-id?)) diff --git a/modules/rosenthal/utils/serializers.scm b/modules/rosenthal/utils/serializers.scm index b066371..ceb47a4 100644 --- a/modules/rosenthal/utils/serializers.scm +++ b/modules/rosenthal/utils/serializers.scm @@ -1,12 +1,13 @@ -;;; SPDX-FileCopyrightText: Copyright © 2022 Andrew Tropin -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © Copyright © 2022 Andrew Tropin (define-module (rosenthal utils serializers) - #:use-module (gnu services configuration) - #:use-module (guix gexp) + ;; Guile builtins #:use-module (srfi srfi-1) - + ;; Utilities + #:use-module (guix gexp) + ;; Guix System - services + #:use-module (gnu services configuration) #:export (path? serialize-path diff --git a/modules/rosenthal/utils/serializers/ini.scm b/modules/rosenthal/utils/serializers/ini.scm index 4e30bf8..0b843ca 100644 --- a/modules/rosenthal/utils/serializers/ini.scm +++ b/modules/rosenthal/utils/serializers/ini.scm @@ -1,16 +1,18 @@ -;;; SPDX-FileCopyrightText: Copyright © 2022 Andrew Tropin -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © Copyright © 2022 Andrew Tropin (define-module (rosenthal utils serializers ini) - #:use-module (ice-9 match) + ;; Guile builtins #:use-module (ice-9 format) + #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (rosenthal utils serializers) - #:use-module (guix packages) - #:use-module (guix gexp) + ;; Utilities #:use-module (guix diagnostics) + #:use-module (guix gexp) + #:use-module (guix packages) #:use-module (guix ui) + #:use-module (rosenthal utils serializers) + ;; Guix System - services #:use-module (gnu services configuration) #:export (ini-serialize ini-print diff --git a/modules/rosenthal/utils/serializers/yaml.scm b/modules/rosenthal/utils/serializers/yaml.scm index 537c5d3..51b5951 100644 --- a/modules/rosenthal/utils/serializers/yaml.scm +++ b/modules/rosenthal/utils/serializers/yaml.scm @@ -1,18 +1,21 @@ -;;; SPDX-FileCopyrightText: Copyright © 2023 Miguel Ángel Moreno -;;; ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © Copyright © 2023 Miguel Ángel Moreno (define-module (rosenthal utils serializers yaml) - #:use-module (rosenthal utils serializers) - #:use-module (gnu home services utils) - #:use-module (gnu services configuration) + ;; Guile builtins + #:use-module (ice-9 format) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-43) + ;; Utilities #:use-module (guix diagnostics) #:use-module (guix gexp) #:use-module (guix ui) - #:use-module (ice-9 match) - #:use-module (ice-9 format) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-43) + #:use-module (rosenthal utils serializers) + ;; Guix System - services + #:use-module (gnu services configuration) + ;; Guix Home - services + #:use-module (gnu home services utils) #:export (yaml-print yaml-config? yaml-serialize diff --git a/modules/rosenthal/utils/transformations.scm b/modules/rosenthal/utils/transformations.scm index 5b5a601..f75cf3f 100644 --- a/modules/rosenthal/utils/transformations.scm +++ b/modules/rosenthal/utils/transformations.scm @@ -2,15 +2,20 @@ ;;; Copyright © 2025 Hilton Chain (define-module (rosenthal utils transformations) + ;; Guile builtins #:use-module (srfi srfi-1) + ;; Utilities #:use-module (guix channels) #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) + ;; Guix System #:use-module (gnu system) + ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services base) #:use-module (rosenthal services file-systems) + ;; Guix packages #:use-module (gnu packages package-management) #:use-module (gnu packages file-systems) #:export (rosenthal-transformation-guix diff --git a/pre-inst-env b/pre-inst-env index 86233ac..f4cb562 100755 --- a/pre-inst-env +++ b/pre-inst-env @@ -1,7 +1,4 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2025 Hilton Chain -# -# SPDX-License-Identifier: CC0-1.0 load_path="$(dirname "$(realpath "$0")")/modules"