From 204ecd0461da62a080d5083703b1d51d7f1cedb8 Mon Sep 17 00:00:00 2001 From: purian23 Date: Fri, 10 Jul 2026 18:14:13 -0400 Subject: [PATCH] feat(void): switch package repositories to R2 --- core/cmd/dms/commands_greeter.go | 2 +- core/internal/distros/void.go | 4 ++-- core/internal/greeter/installer.go | 2 +- distro/void/README.md | 12 +++++++++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/core/cmd/dms/commands_greeter.go b/core/cmd/dms/commands_greeter.go index a98976fe4..720ea29ad 100644 --- a/core/cmd/dms/commands_greeter.go +++ b/core/cmd/dms/commands_greeter.go @@ -1535,7 +1535,7 @@ func packageInstallHint() string { case distros.FamilyArch: return "Install from AUR with 'paru -S greetd-dms-greeter-git' or 'yay -S greetd-dms-greeter-git'" case distros.FamilyVoid: - return "Install with 'sudo xbps-install -S dms-greeter' (requires DMS XBPS repo: echo 'repository=https://avengemedia.github.io/DankMaterialShell/current' | sudo tee /etc/xbps.d/dms.conf)" + return "Install with 'sudo xbps-install -S dms-greeter' (requires DMS XBPS repo: echo 'repository=https://void.danklinux.com/dms/current' | sudo tee /etc/xbps.d/dms.conf)" default: return "Run 'dms greeter install' to install greeter" } diff --git a/core/internal/distros/void.go b/core/internal/distros/void.go index 581062470..f83f907ef 100644 --- a/core/internal/distros/void.go +++ b/core/internal/distros/void.go @@ -13,8 +13,8 @@ import ( ) const ( - VoidDMSRepo = "https://avengemedia.github.io/DankMaterialShell/current" - VoidDankLinuxRepo = "https://avengemedia.github.io/DankLinux/current" + VoidDMSRepo = "https://void.danklinux.com/dms/current" + VoidDankLinuxRepo = "https://void.danklinux.com/danklinux/current" VoidHyprlandRepo = "https://mirror.black-hole.dev/x86_64" voidRunitSvDir = "/etc/sv" diff --git a/core/internal/greeter/installer.go b/core/internal/greeter/installer.go index 491415868..af81ad3e7 100644 --- a/core/internal/greeter/installer.go +++ b/core/internal/greeter/installer.go @@ -990,7 +990,7 @@ func TryInstallGreeterPackage(logFunc func(string), sudoPassword string) bool { failHint = fmt.Sprintf("⚠ dms-greeter install failed. Install from AUR: %s -S greetd-dms-greeter-git", aurHelper) installCmd = exec.CommandContext(ctx, aurHelper, "-S", "--noconfirm", "greetd-dms-greeter-git") case distros.FamilyVoid: - failHint = "⚠ dms-greeter install failed. Add the DMS XBPS repo manually:\necho 'repository=https://avengemedia.github.io/DankMaterialShell/current' | sudo tee /etc/xbps.d/dms.conf\nsudo xbps-install -Sy dms-greeter" + failHint = "⚠ dms-greeter install failed. Add the DMS XBPS repo manually:\necho 'repository=https://void.danklinux.com/dms/current' | sudo tee /etc/xbps.d/dms.conf\nsudo xbps-install -Sy dms-greeter" logFunc("Adding DMS XBPS repository...") if err := ensureVoidXBPSRepo(ctx, sudoPassword, "dms", distros.VoidDMSRepo); err != nil { logFunc(fmt.Sprintf("⚠ Failed to add DMS XBPS repository: %v", err)) diff --git a/distro/void/README.md b/distro/void/README.md index 69d1b305d..8e058dc53 100644 --- a/distro/void/README.md +++ b/distro/void/README.md @@ -17,15 +17,21 @@ This is a DMS maintained repo for VoidLinux until these packages are officially ### Using the Self-Hosted Repositories -We serve both stable release and development packages directly from our repository branches. +We serve both stable release and development packages from Cloudflare R2 at +`void.danklinux.com`. + +> **Repository migration:** the former GitHub Pages repositories will be +> frozen for 14 days at cutover. Their retirement date will be announced when +> the snapshots are frozen. Replace any existing `avengemedia.github.io` +> entries with the URLs below. #### 1. Add Repository Configurations Create configuration files in `/etc/xbps.d/` pointing to our repositories (needed for both stable and git/nightly variants): ```sh -echo "repository=https://avengemedia.github.io/DankMaterialShell/current" | sudo tee /etc/xbps.d/dms.conf -echo "repository=https://avengemedia.github.io/DankLinux/current" | sudo tee /etc/xbps.d/danklinux.conf +echo "repository=https://void.danklinux.com/dms/current" | sudo tee /etc/xbps.d/dms.conf +echo "repository=https://void.danklinux.com/danklinux/current" | sudo tee /etc/xbps.d/danklinux.conf ``` #### 2. Install DMS