rosenthal: tailscale: Update to 1.86.0.

* modules/rosenthal/packages/networking.scm (tailscale): Update to 1.86.0.
[native-inputs]: Update vendored Go dependencies.

.guix-authorizations

@@ -1,7 +1,7 @@
-;;; -*- mode: scheme -*-
+;; -*- mode: scheme -*-
-;;; SPDX-FileCopyrightText: 2022, 2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022, 2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: CC0-1.0
+;; SPDX-License-Identifier: CC0-1.0
 
 (authorizations
  (version 0)

modules/guix/import/rosenthal-updaters.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2024, 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2024, 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (guix import rosenthal-updaters)
   #:use-module (srfi srfi-71)

modules/rosenthal/bootloader/grub.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal bootloader grub)
   #:use-module (gnu bootloader)

modules/rosenthal/examples/emacs/fonts.el

@@ -1,8 +1,8 @@
 ;;; -*- lexical-binding: t -*-
-;;; SPDX-FileCopyrightText: DogLooksGood <doglooksgood@hotmail.com>
+;; SPDX-FileCopyrightText: DogLooksGood <doglooksgood@hotmail.com>
-;;; SPDX-FileCopyrightText: 2022 Nyk Ma <i@nyk.ma>
+;; SPDX-FileCopyrightText: 2022 Nyk Ma <i@nyk.ma>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; 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

modules/rosenthal/packages/admin.scm

@@ -1,7 +1,7 @@
-;;; SPDX-FileCopyrightText: 2022, 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022, 2025 Hilton Chain <hako@ultrarare.space>
-;;; SPDX-FileCopyrightText: 2025 William Goodspeed
+;; SPDX-FileCopyrightText: 2025 William Goodspeed
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages admin)
   #:use-module ((guix licenses) #:prefix license:)

modules/rosenthal/packages/binaries.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2023-2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2023-2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages binaries)
   #:use-module (srfi srfi-1)

modules/rosenthal/packages/bootloaders.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages bootloaders)
   #:use-module (guix download)

modules/rosenthal/packages/browser-extensions.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2023-2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2023-2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages browser-extensions)
   #:use-module (srfi srfi-1)

modules/rosenthal/packages/busybox.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages busybox)
   #:use-module (guix gexp)

modules/rosenthal/packages/ci.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages ci)
   #:use-module ((guix licenses) #:prefix license:)

modules/rosenthal/packages/dns.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages dns)
   #:use-module ((guix licenses) #:prefix license:)

modules/rosenthal/packages/emacs-xyz.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages emacs-xyz)
   #:use-module ((guix licenses) #:prefix license:)
@@ -39,24 +39,6 @@ editing Caddyfiles, configuration files for @code{caddy}.")
       (properties
        '((disable-updater? . #t))))))
 
-(define-public emacs-eat/hako
-  (package
-    (inherit
-     (package-with-extra-patches emacs-eat
-       (list (origin
-               (method url-fetch)
-               (uri "https://codeberg.org/akib/emacs-eat/pulls/133.patch")
-               (sha256
-                (base32
-                 "0rn2xf2jq9i42ndcd3wxrr5lid8r4kxqiyr84dasv5ihqg8as5d5")))
-             (origin
-               (method url-fetch)
-               (uri "https://codeberg.org/akib/emacs-eat/pulls/228.patch")
-               (sha256
-                (base32
-                 "14d6nvagcri0r687y3m179ijmnad89m5d5dj2rn2p6rpfc5nssr0"))))))
-    (name "emacs-eat-hako")))
-
 (define-public emacs-nftables-mode
   (package
     (name "emacs-nftables-mode")

modules/rosenthal/packages/networking.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022-2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages networking)
   #:use-module ((guix licenses) #:prefix license:)
@@ -139,7 +139,7 @@ bypass network restrictions." )
 (define-public sing-box
   (package
     (name "sing-box")
-    (version "1.12.0")
+    (version "1.11.15")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -148,7 +148,7 @@ bypass network restrictions." )
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1dpf84c9iqz14pkvbac3r8plmwkh6cg0qy3965isg11ijqjhcg54"))))
+                "1i5zfafbc21m0hn0sysn2pqpkp0v84dzlz2haxli3pm4y7fdb8xs"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -161,8 +161,9 @@ bypass network restrictions." )
                        '("with_quic"
                          "with_dhcp"
                          "with_wireguard"
-                         "with_tailscale"
+                         "with_ech"
                          "with_utls"
+                         "with_reality_server"
                          "with_acme"
                          "with_clash_api"
                          "with_gvisor"))
@@ -186,12 +187,6 @@ bypass network restrictions." )
                "vendor")))
           (replace 'install-license-files
             (assoc-ref gnu:%standard-phases 'install-license-files))
-          (add-after 'unpack 'set-tailscale-default-wireguard-port
-            (lambda _
-              ;; See also: https://tailscale.com/kb/1082/firewall-ports
-              ;; https://github.com/tailscale/tailscale/blob/51c11a864b1241d1cf1a736fbc94b0f8c76da563/cmd/tailscaled/tailscaled.go#L102
-              (substitute* "vendor/github.com/sagernet/tailscale/tsnet/tsnet.go"
-                (("s\\.Port") "41641"))))
           (add-after 'install 'install-extras
             (lambda _
               (let ((sing-box
@@ -216,7 +211,7 @@ bypass network restrictions." )
               (file-name "vendored-go-dependencies")
               (sha256
                (base32
-                "0x4sd4hnyng2ihgp3i2sagw9f1md3l6rrpkbwrjkgngg30mp7s4m"))))
+                "1qllq09ln8r22cyrwssycjl9d8by2fx05vh8nvnqy1ri8ding6d9"))))
       (if (%current-target-system)
           (list this-package)
           '())))

modules/rosenthal/packages/password-utils.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages password-utils)
   #:use-module (guix gexp)

modules/rosenthal/packages/rust-apps.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages rust-apps)
   #:use-module ((guix licenses) #:prefix license:)

modules/rosenthal/packages/ssh.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages ssh)
   #:use-module (guix gexp)

modules/rosenthal/packages/tree-sitter.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages tree-sitter)
   #:use-module (guix gexp)

modules/rosenthal/packages/video.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages video)
   #:use-module (guix gexp)

modules/rosenthal/packages/web.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022, 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022, 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages web)
   #:use-module ((guix licenses) #:prefix license:)

modules/rosenthal/packages/wm.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages wm)
   #:use-module ((guix licenses) #:prefix license:)

modules/rosenthal/packages/xorg.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages xorg)
   #:use-module ((guix licenses) #:prefix license:)

modules/rosenthal/services/bittorrent.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal services bittorrent)
   #:use-module (ice-9 format)
@@ -18,9 +18,9 @@
             qbittorrent-service-type
             home-qbittorrent-service-type))
 
-;;;
+;;
-;;; qBittorrent
+;; qBittorrent
-;;;
+;;
 
 
 (define-configuration qbittorrent-configuration

modules/rosenthal/services/child-error.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal services child-error)
   #:use-module (guix records)
@@ -42,9 +42,9 @@
             home-socks2http-configuration
             home-socks2http-service-type))
 
-;;;
+;;
-;;; Clash
+;; Clash
-;;;
+;;
 
 
 (define-configuration clash-configuration
@@ -122,9 +122,9 @@
    (description "Run Clash.")))
 
 
-;;;
+;;
-;;; Cloudflare Tunnel
+;; Cloudflare Tunnel
-;;;
+;;
 
 
 (define-maybe string)
@@ -213,9 +213,9 @@ headers.  This can expose sensitive information in your logs.")
    (description "Run cloudflared, the Cloudflare Tunnel daemon.")))
 
 
-;;;
+;;
-;;; Cloudflare Warp
+;; Cloudflare Warp
-;;;
+;;
 
 
 (define-configuration cloudflare-warp-configuration
@@ -250,9 +250,9 @@ headers.  This can expose sensitive information in your logs.")
    (description "Run warp-svc, the Cloudflare Warp daemon.")))
 
 
-;;;
+;;
-;;; Miniflux
+;; Miniflux
-;;;
+;;
 
 
 (define-maybe string)
@@ -326,9 +326,9 @@ headers.  This can expose sensitive information in your logs.")
    (description "Run Miniflux, a minimalist and opinionated feed reader.")))
 
 
-;;;
+;;
-;;; Wakapi
+;; Wakapi
-;;;
+;;
 
 
 (define-configuration home-wakapi-configuration
@@ -365,9 +365,9 @@ headers.  This can expose sensitive information in your logs.")
    (description "Run Wakapi, a self-hosted WakaTime-compatible backend.")))
 
 
-;;;
+;;
-;;; ShadowTLS
+;; ShadowTLS
-;;;
+;;
 
 
 (define-maybe list-of-strings
@@ -524,9 +524,9 @@ is @code{443} by default")
    (default-value (for-home (shadow-tls-configuration)))))
 
 
-;;;
+;;
-;;; Socks2http
+;; Socks2http
-;;;
+;;
 
 
 (define-configuration home-socks2http-configuration

modules/rosenthal/services/dns.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2022, 2023 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal services dns)
   #:use-module (guix gexp)
@@ -12,9 +12,9 @@
   #:export (smartdns-configuration
             smartdns-service-type))
 
-;;;
+;;
-;;; Smartdns
+;; Smartdns
-;;;
+;;
 
 
 (define-configuration smartdns-configuration

modules/rosenthal/services/file-systems.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal services file-systems)
   #:use-module (guix gexp)
@@ -16,9 +16,9 @@
             dumb-runtime-dir-service-type))
 
 
-;;;
+;;
-;;; Btrbk
+;; Btrbk
-;;;
+;;
 
 
 (define-configuration btrbk-configuration

modules/rosenthal/services/mail.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal services mail)
   #:use-module (srfi srfi-26)

modules/rosenthal/services/networking.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2023 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal services networking)
   #:use-module (srfi srfi-1)
@@ -15,19 +15,15 @@
   #:use-module (gnu services configuration)
   #:use-module (gnu services dbus)
   #:use-module (gnu services shepherd)
-  #:use-module (gnu system shadow)
   #:export (iwd-configuration
             iwd-service-type
 
-            sing-box-service-type
-            sing-box-configuration
-
             tailscale-configuration
             tailscale-service-type))
 
-;;;
+;;
-;;; iwd
+;; iwd
-;;;
+;;
 
 
 (define %iwd-config-general
@@ -382,84 +378,9 @@ list, power save will be disabled."))
    (description "Run iwd, the iNet wireless daemon.")))
 
 
-;;;
+;;
-;;; sing-box
+;; Tailscale
-;;;
+;;
-
-(define (file-object? val)
-  (or (string? val)
-      (file-like? val)))
-
-(define-configuration/no-serialization sing-box-configuration
-  (sing-box
-   (file-like sing-box)
-   "")
-  (config-file
-   file-object
-   "")
-  (data-directory
-   (string "/var/lib/sing-box")
-   "")
-  ;; Shepherd
-  (shepherd-provision
-   (list-of-symbols '(sing-box))
-   "")
-  (shepherd-requirement
-   (list-of-symbols '(networking))
-   "")
-  (log-file
-   (string "/var/log/sing-box.log")
-   "")
-  (auto-start?
-   (boolean #t)
-   ""))
-
-(define sing-box-account
-  (list (user-group (name "sing-box") (system? #t))))
-
-(define sing-box-activation
-  (match-record-lambda <sing-box-configuration>
-      (data-directory)
-    #~(begin
-        (use-modules (guix build utils))
-        (mkdir-p #$data-directory))))
-
-(define sing-box-shepherd-service
-  (match-record-lambda <sing-box-configuration>
-      (sing-box data-directory config-file
-       shepherd-provision shepherd-requirement log-file auto-start?)
-    (list (shepherd-service
-            (provision shepherd-provision)
-            (requirement `(user-processes ,@shepherd-requirement))
-            (start
-             #~(make-forkexec-constructor
-                (list #$(file-append sing-box "/bin/sing-box")
-                      "--config" #$config-file
-                      "--directory" #$data-directory
-                      "--disable-color"
-                      "run")
-                #:log-file #$log-file))
-            (stop #~(make-kill-destructor))
-            (auto-start? auto-start?)))))
-
-(define sing-box-service-type
-  (service-type
-    (name 'sing-box)
-    (extensions
-     (list (service-extension account-service-type
-                              (const sing-box-account))
-           (service-extension activation-service-type
-                              sing-box-activation)
-           (service-extension shepherd-root-service-type
-                              sing-box-shepherd-service)
-           (service-extension log-rotation-service-type
-                              (compose list sing-box-configuration-log-file))))
-    (description "")))
-
-
-;;;
-;;; Tailscale
-;;;
 
 
 (define-configuration tailscale-configuration

modules/rosenthal/services/web.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2024 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2024 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal services web)
   #:use-module (guix gexp)
@@ -51,16 +51,6 @@
    "")
   (caddyfile
    file-like
-   "")
-  ;; Shepherd
-  (shepherd-provision
-   (list-of-symbols '(caddy))
-   "")
-  (shepherd-requirement
-   (list-of-symbols '())
-   "")
-  (auto-start?
-   (boolean #t)
    ""))
 
 (define (caddy-accounts config)
@@ -101,12 +91,10 @@
                (chown file (passwd:uid user) (passwd:gid user)))
              (find-files data-dir #:directories? #t)))))))
 
-(define caddy-shepherd-services
+(define (caddy-shepherd-services config)
-  (match-record-lambda <caddy-configuration>
-      (shepherd-provision shepherd-requirement auto-start?)
   (list (shepherd-service
-            (provision shepherd-provision)
+          (provision '(caddy))
-            (requirement `(user-processes loopback ,@shepherd-requirement))
+          (requirement '(user-processes loopback))
           (start
            #~(make-forkexec-constructor
               (list "/run/privileged/bin/caddy" "run"
@@ -118,8 +106,7 @@
               #:resource-limits '((nofile 1048576 1048576))
               #:environment-variables '("HOME=/var/lib/caddy")))
           (stop
-             #~(make-kill-destructor))
+           #~(make-kill-destructor)))))
-            (auto-start? auto-start?)))))
 
 (define caddy-service-type
   (service-type
@@ -138,9 +125,9 @@
 
 
 
-;;;
+;;
-;;; Forgejo
+;; Forgejo
-;;;
+;;
 
 
 (define (file-object? val)
@@ -231,9 +218,9 @@
    (description "Run Forgejo.")))
 
 
-;;;
+;;
-;;; Jellyfin
+;; Jellyfin
-;;;
+;;
 
 
 (define-maybe string)
@@ -375,9 +362,9 @@
    (description "Run Komga.")))
 
 
-;;;
+;;
-;;; Misskey
+;; Misskey
-;;;
+;;
 
 
 (define-configuration misskey-configuration
@@ -525,9 +512,9 @@
    (description "Run Navidrome.")))
 
 
-;;;
+;;
-;;; Vaultwarden
+;; Vaultwarden
-;;;
+;;
 
 
 (define-configuration vaultwarden-configuration

modules/rosenthal/utils/download.scm

@@ -1,6 +1,6 @@
-;;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
+;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
-;;;
+;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal utils download)
   #:use-module (guix gexp)