From e4afbe625faff54977e926dde76acd7141ef310a Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@a-lec.org>
Date: Fri, 1 Sep 2023 19:02:56 +0200
Subject: [PATCH] CUPS now works and we use 10 cores to build things with guix

---
 .gitignore | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 config.scm | 26 +++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..be2f2b7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,46 @@
+.pwd.lock
+NetworkManager/
+asound.conf
+bashrc
+cups/
+dbus-1
+environment
+fstab
+group
+guix/
+hostname
+hosts
+issue
+libvirt/
+localtime
+login.defs
+lvm/
+machine-id
+mtab
+nonguix-key.pub
+nsswitch.conf
+os-release
+pam.d
+passwd
+polkit-1
+printcap
+profile
+profile.d/
+protocols
+pulse
+resolv.conf
+resolv.conf.bak
+rottlog
+rpc
+security
+services
+shadow
+shells
+skel
+ssl
+static
+sudoers
+sysconfig/
+syslog.conf
+timezone
+udev
diff --git a/config.scm b/config.scm
index b36bf4d..a3e57e2 100644
--- a/config.scm
+++ b/config.scm
@@ -10,7 +10,9 @@
 ;; Indique quels modules importer pour accéder aux variables
 ;; utilisées dans cette configuration.
 (use-modules (gnu))
-(use-modules (gnu system setuid))
+(use-modules (guix inferior) (guix channels))
+(use-modules (srfi srfi-1))
+(use-modules (gnu system setuid) (gnu packages cups))
 (use-modules (nongnu packages linux) (nongnu system linux-initrd))
 (use-service-modules cups desktop networking ssh xorg virtualization vpn)
 
@@ -30,6 +32,19 @@ SUBSYSTEM==\"usb\", GROUP=\"spice\", MODE=\"0660\"
 SUBSYSTEM==\"usb_device\", GROUP=\"spice\", MODE=\"0660\"
 ")))
 
+(define channels
+  ;; This is the old revision from which we want to
+  ;; extract guile-json.
+  (list (channel
+         (name 'guix)
+         (url "https://git.savannah.gnu.org/git/guix.git")
+         (commit
+          "306737c6797cc209a4f034e51c4057c15c6cc311"))))
+
+(define inferior
+  ;; An inferior representing the above revision.
+  (inferior-for-channels channels))
+
 ;; Début de la configuration
 (operating-system
   (locale "fr_FR.utf8")
@@ -85,6 +100,7 @@ SUBSYSTEM==\"usb_device\", GROUP=\"spice\", MODE=\"0660\"
                           (specification->package "network-manager-openvpn")
                           (specification->package "xf86-video-ati")
                           (specification->package "thin-provisioning-tools"))
+;                          (first (lookup-inferior-packages inferior "icecat")))
                     %base-packages))
 
   ;; Voici la liste des services du système.  Pour trouver les services disponibles,
@@ -93,7 +109,11 @@ SUBSYSTEM==\"usb_device\", GROUP=\"spice\", MODE=\"0660\"
     (modify-services  (append  
                         (list 
                           (service gnome-desktop-service-type)
-                          (service cups-service-type)
+                          (service cups-service-type
+                            (cups-configuration
+                              (web-interface? #t)
+                              (extensions
+                                (list cups-filters epson-inkjet-printer-escpr hplip-minimal))))
                           (service libvirt-service-type
                             (libvirt-configuration
                               (unix-sock-group "libvirt")))
@@ -115,7 +135,7 @@ SUBSYSTEM==\"usb_device\", GROUP=\"spice\", MODE=\"0660\"
 
     (guix-service-type config => (guix-configuration
       (inherit config)
-      (extra-options '("--cores=5"))))))
+      (extra-options '("--cores=10"))))))
 
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)