Configure hel to use non-guix channel (home-channels-service-type)

3 files changed, 55 insertions, 13 deletions

diff --git a/kolwynia/channels.scm b/kolwynia/channels.scm
new file mode 100644
index 0000000..a638d25
--- /dev/null
+++ b/kolwynia/channels.scm
@@ -0,0 +1,42 @@
+;;; Copyright © 2026 bdunahu <bdunahu@operationnull.com>
+(define-module (kolwynia channels)
+  #:use-module (guix channels)
+  #:export (guix
+            tanelorn
+            nonguix))
+
+;;; Commentary:
+;;; Code:
+
+(define guix
+  (channel
+    (name 'guix)
+    (url "https://codeberg.org/guix/guix")
+    (branch "master")
+    (introduction
+     (make-channel-introduction
+      "9edb3f66fd807b096b48283debdcddccfea34bad"
+      (openpgp-fingerprint
+       "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA")))))
+
+(define tanelorn
+  (channel
+    (name 'tanelorn)
+    (url "https://git.operationnull.com/tanelorn.git")
+    (introduction
+     (make-channel-introduction
+      "3960d45383c672f8aacab8e354824793256c9d29"
+      (openpgp-fingerprint
+       "5550 5CA6 9DE5 D342 7F31 F9AE 5F86 6C65 2A34 C996")))))
+
+(define nonguix
+  (channel
+    (name 'nonguix)
+    (url "https://gitlab.com/nonguix/nonguix")
+    (introduction
+     (make-channel-introduction
+      "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+      (openpgp-fingerprint
+       "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5")))))
+
+;;; channels.scm ends here
diff --git a/kolwynia/home/bdunahu.scm b/kolwynia/home/bdunahu.scm
index 4c60772..0a1f80a 100644
--- a/kolwynia/home/bdunahu.scm
+++ b/kolwynia/home/bdunahu.scm
@@ -2,10 +2,12 @@
 (define-module (kolwynia home bdunahu)
   #:use-module (gnu)
   #:use-module (gnu home services)
+  #:use-module (gnu services xorg)
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services dict)
   #:use-module (gnu home services dotfiles)
   #:use-module (gnu home services gnupg)
+  #:use-module (gnu home services guix)
   #:use-module (gnu home services mail)
   #:use-module (gnu home services mcron)
   #:use-module (gnu home services shells)
@@ -13,8 +15,11 @@
   #:use-module (gnu home services ssh)
   #:use-module (gnu home services xdg)
   #:use-module (gnu packages gnupg) ;pinentry-emacs
+  #:use-module (kolwynia utils)
+  #:use-module ((kolwynia channels)
+                #:prefix channel:)
   #:use-module ((kolwynia home bdunahu packages)
-		#:prefix pkgs:)
+                #:prefix pkgs:)
   #:use-module ((kolwynia home bdunahu app-preferences)
                 #:prefix app:)
   #:use-module ((kolwynia home bdunahu ssh)
@@ -50,9 +55,13 @@
            ;; TODO: causes EXWM XELB: Authorization required,
            ;; but no authorization protocol specified.
            ;; ,(service home-startx-command-service-type)
-	   (service home-dotfiles-service-type
-		    (home-dotfiles-configuration
-		      (directories '("./bdunahu/files"))))
+           (service home-channels-service-type
+                    (cons* channel:guix
+                           channel:tanelorn
+                           (if hel? (list channel:nonguix) '())))
+           (service home-dotfiles-service-type
+                    (home-dotfiles-configuration
+                      (directories '("./bdunahu/files"))))
            (service home-gpg-agent-service-type
                     (home-gpg-agent-configuration
                       (pinentry-program
diff --git a/kolwynia/home/bdunahu/files/.config/guix/channels.scm b/kolwynia/home/bdunahu/files/.config/guix/channels.scm
deleted file mode 100644
index f0ed659..0000000
--- a/kolwynia/home/bdunahu/files/.config/guix/channels.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(append (list (channel
-		(name 'tanelorn)
-		(url "https://git.operationnull.com/tanelorn.git")
-		(introduction
-		 (make-channel-introduction
-		  "feb72dbc897bcf2db3901ea5b25caba4add860f7"
-		  (openpgp-fingerprint
-		   "5550 5CA6 9DE5 D342 7F31 F9AE 5F86 6C65 2A34 C996")))))
-	%default-channels)