From 9ef9fd9e6aae3bb4784c1021d2ffcff8ea4dec2f Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@ditigal.xyz>
Date: Mon, 12 May 2025 09:56:41 +0200
Subject: [PATCH] chore: update, switch to codeberg mirror

---
 channels-lock.scm | 30 +++++++++++++++---------------
 channels.scm      | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/channels-lock.scm b/channels-lock.scm
index 305ff3e..23ad0dd 100644
--- a/channels-lock.scm
+++ b/channels-lock.scm
@@ -1,20 +1,9 @@
 (list (channel
-        (name 'rde)
-        (url "https://git.sr.ht/~abcdw/rde")
-        (branch "master")
-        (commit
-          "bfe0605f72161d2648b194316a89de2902217ff7")
-        (introduction
-          (make-channel-introduction
-            "257cebd587b66e4d865b3537a9a88cccd7107c95"
-            (openpgp-fingerprint
-              "2841 9AC6 5038 7440 C7E9  2FFA 2208 D209 58C1 DEB0"))))
-      (channel
         (name 'nonguix)
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "ae6e9f28343d990f1e11286e99dd195d80dc65b0")
+          "19406981a9bf9d0b140180f1f3008cb91f716b4b")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,15 +14,26 @@
         (url "https://git.ditigal.xyz/~ruther/guix-exprs")
         (branch "main")
         (commit
-          "4aef3e72981477f2521ac346d65f7d48c8210bf7"))
+          "1a49e4760bd922237532fa2eee44bc9e1fe42399"))
       (channel
         (name 'guix)
         (url "https://codeberg.org/guix/guix-mirror")
         (branch "master")
         (commit
-          "16ee065aa006e4cd8982e26cd0430f9e018874ad")
+          "300d29e69988caf23684f08effa51f621c7ec083")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
             (openpgp-fingerprint
-              "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA")))))
+              "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
+      (channel
+        (name 'rde)
+        (url "https://git.sr.ht/~abcdw/rde")
+        (branch "master")
+        (commit
+          "bf8f628c4deb9acc94e261db80d301048ea1f0a2")
+        (introduction
+          (make-channel-introduction
+            "257cebd587b66e4d865b3537a9a88cccd7107c95"
+            (openpgp-fingerprint
+              "2841 9AC6 5038 7440 C7E9  2FFA 2208 D209 58C1 DEB0")))))
diff --git a/channels.scm b/channels.scm
index 72c8109..1c04f3d 100644
--- a/channels.scm
+++ b/channels.scm
@@ -2,15 +2,7 @@
   #:use-module (guix channels))
 
 (define-public my-channels
-  (cons*
-   (channel
-    (name 'rde)
-    (url "https://git.sr.ht/~abcdw/rde")
-    (introduction
-     (make-channel-introduction
-      "257cebd587b66e4d865b3537a9a88cccd7107c95"
-      (openpgp-fingerprint
-       "2841 9AC6 5038 7440 C7E9  2FFA 2208 D209 58C1 DEB0"))))
+  (list
    (channel
     (name 'nonguix)
     (url "https://gitlab.com/nonguix/nonguix")
@@ -24,6 +16,14 @@
     (name 'ruther)
     (url "https://git.ditigal.xyz/~ruther/guix-exprs")
     (branch "main"))
-   %default-channels))
+   (channel
+    (name 'guix)
+    ;; (branch "mesa-updates")
+    (url "https://codeberg.org/guix/guix-mirror")
+    (introduction
+     (make-channel-introduction
+      "9edb3f66fd807b096b48283debdcddccfea34bad"     ;2020-05-26
+      (openpgp-fingerprint                           ;mbakke
+       "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))))
 
 my-channels
-- 
2.49.0