From 153e3e86b0abda1b3e46b8f70264cce36733b246 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Tue, 19 Sep 2023 16:50:28 +0800
Subject: [PATCH] feat: channels & substitute-url

---
 channels.scm | 16 ++++++++++++++++
 config.scm   | 34 +++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 channels.scm

diff --git a/channels.scm b/channels.scm
new file mode 100644
index 0000000..bcd92b7
--- /dev/null
+++ b/channels.scm
@@ -0,0 +1,16 @@
+(cons*
+  ;; packages some non-free software which cannot be included in the official distribution
+  (channel
+    (name 'nonguix)
+    (url "https://gitlab.com/nonguix/nonguix")
+    ;; Enable signature verification:
+    (introduction
+     (make-channel-introduction
+      "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+      (openpgp-fingerprint
+       "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
+  ;; default guix channel(Mirror in China)
+  (channel
+    (inherit (car %default-channels))
+    (url "https://mirror.guix.org.cn/git/guix.git")))
+
diff --git a/config.scm b/config.scm
index 18d7c6a..8dca58e 100644
--- a/config.scm
+++ b/config.scm
@@ -11,6 +11,9 @@
 ;; used in this configuration.
 (use-modules (gnu))
 (use-service-modules cups desktop networking ssh xorg)
+;; Import nonfree linux module.
+(use-modules (nongnu packages linux)
+             (nongnu system linux-initrd))
 
 (operating-system
   (locale "en_US.utf8")
@@ -18,6 +21,11 @@
   (keyboard-layout (keyboard-layout "us"))
   (host-name "guix-test")
 
+  ;; Using the standard Linux kernel and nonfree firmware
+  (kernel linux)
+  (initrd microcode-initrd)
+  (firmware (list linux-firmware))
+
   ;; The list of user accounts ('root' is implicit).
   (users (cons* (user-account
                   (name "ryan")
@@ -40,17 +48,25 @@
   ;; Below is the list of system services.  To search for available
   ;; services, run 'guix system search KEYWORD' in a terminal.
   (services
-   (append (list
+   (append
+    (list
+      ;; To configure OpenSSH, pass an 'openssh-configuration'
+      ;; record as a second argument to 'service' below.
+      (service openssh-service-type)
+
+      (set-xorg-configuration
+       (xorg-configuration (keyboard-layout keyboard-layout))))
 
-                 ;; To configure OpenSSH, pass an 'openssh-configuration'
-                 ;; record as a second argument to 'service' below.
-                 (service openssh-service-type)
-                 (set-xorg-configuration
-                  (xorg-configuration (keyboard-layout keyboard-layout))))
+      ;; Using the substitute server of SJTU to speed up the download.
+      (modify-services %desktop-services
+      	(guix-service-type
+      	 config => (guix-configuration
+      	(inherit config)
+      	(substitute-urls '("https://mirror.sjtu.edu.cn/guix/" "https://ci.guix.gnu.org")))))
 
-           ;; This is the default list of services we
-           ;; are appending to.
-           %desktop-services))
+      ;; This is the default list of services we
+      ;; are appending to.
+      %desktop-services))
   (bootloader (bootloader-configuration
                 (bootloader grub-bootloader)
                 (targets (list "/dev/sda"))