From 8665a404ffea824c26c1fe773704217fde896f22 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@a-lec.org>
Date: Tue, 7 Nov 2023 11:03:48 +0100
Subject: [PATCH] =?UTF-8?q?Lib=C3=A9ration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.scm | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/config.scm b/config.scm
index 07c36e2..8f81c7a 100644
--- a/config.scm
+++ b/config.scm
@@ -10,11 +10,9 @@
 ;; Indique quels modules importer pour accéder aux variables
 ;; utilisées dans cette configuration.
 (use-modules (gnu))
-(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)
+(use-service-modules cups desktop networking ssh xorg virtualization vpn security-token)
 
 ;; Configuration sudoer personnalisée
 (define %sudoers-specification
@@ -61,16 +59,11 @@ KERNEL==\"sd?1\", ATTRS{idVendor}==\"20a0\", ATTRS{idProduct}==\"4109\", SYMLINK
   (keyboard-layout (keyboard-layout "fr" "oss"))
   (host-name "n-guix-fix")
 
-  (kernel linux)
-
-  (initrd microcode-initrd)
-  (firmware (list linux-firmware))
-
   ;; Application de la configuration sudoer personnalisée (définie plus haut)
   (kernel-arguments
-    (list "modprobe.blacklist=nouveau,pcspkr,usbmouse,usbkbd" "iommu=pt"))
+    (list "modprobe.blacklist=pcspkr,usbmouse,usbkbd" "iommu=pt"))
 
-  (initrd-modules (append (list "vfio-pci" "vfio_iommu_type1" "dm-raid" "dm-cache" "dm-crypt" "radeon") %base-initrd-modules))
+  (initrd-modules (append (list "vfio-pci" "vfio_iommu_type1" "dm-raid" "dm-cache" "dm-crypt") %base-initrd-modules))
       
   (sudoers-file %sudoers-specification)
 
@@ -121,11 +114,10 @@ KERNEL==\"sd?1\", ATTRS{idVendor}==\"20a0\", ATTRS{idProduct}==\"4109\", SYMLINK
 
       (service openssh-service-type
         (openssh-configuration
-        (x11-forwarding? #t)
-        (permit-root-login 'prohibit-password)
-        (authorized-keys
-          `(("neox" ,(local-file "/home/neox/.ssh/id_rsa.pub"))))))
-        (service cups-service-type
+          (x11-forwarding? #t)
+          (permit-root-login 'prohibit-password)))
+
+      (service cups-service-type
           (cups-configuration
             (web-interface? #t)
             (extensions
@@ -159,20 +151,7 @@ KERNEL==\"sd?1\", ATTRS{idVendor}==\"20a0\", ATTRS{idProduct}==\"4109\", SYMLINK
 
     (guix-service-type config => (guix-configuration
       (inherit config)
-      (extra-options '("--cores=10"))
-      (substitute-urls
-                (append (list "https://substitutes.nonguix.org")
-                  %default-substitute-urls))
-      (authorized-keys
-        (append 
-          (list 
-            (plain-file "non-guix.pub" 
-              (string-append 
-                "(public-key"
-                " (ecc "
-                "  (curve Ed25519)"
-                "  (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")))
-            %default-authorized-guix-keys))))))
+      (extra-options '("--cores=10"))))))
 
   ;; Chargeur de démarrage (GRUB)
   ;; On indique ici où il doit être installé et comment le configurer
@@ -201,6 +180,7 @@ KERNEL==\"sd?1\", ATTRS{idVendor}==\"20a0\", ATTRS{idProduct}==\"4109\", SYMLINK
       (file-system
         (mount-point "/wiab")
         (device (uuid "2a13cf03-fc71-44ac-8e1a-d6744201336f" 'ext4))
+        (create-mount-point? #t)
         (type "ext4"))
       (file-system
         (mount-point "/")