Merge remote-tracking branch 'origin/corpo-nonefi'

1 files changed, 18 insertions, 50 deletions

diff --git a/vmstore/corpo/corpo-system.scm b/vmstore/corpo/corpo-system.scm
index 8f84c0e..930990f 100644
--- a/vmstore/corpo/corpo-system.scm
+++ b/vmstore/corpo/corpo-system.scm
@@ -11,7 +11,7 @@
 (use-service-modules linux guix desktop pm audio 
 		     networking dbus xorg avahi spice)
 (use-package-modules linux audio libusb wm fonts
-		     freedesktop vim cryptsetup)
+		     freedesktop vim security-token cryptsetup)
 
 (operating-system
   (locale "en_GB.utf8")
@@ -26,44 +26,23 @@
 		  (password (crypt "worker" "$6$abc"))
                   (group "users")
                   (home-directory "/home/corpo")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
+                  (supplementary-groups '("wheel" "plugdev" "netdev" "audio" "video")))
                 %base-user-accounts))
 
   (bootloader (bootloader-configuration
-		(bootloader grub-efi-bootloader)
-		(targets (list "/boot/efi"))
-		(keyboard-layout keyboard-layout)))
-
-  ;; replace post-install
-  (swap-devices (list (swap-space
-			(target (uuid
-				  "7a22a333-6a5d-41fe-93a2-e5781031cfd6")))))
-  ;; luks setup - uncomment post-install
-  ;; and provide source UUID once known
-  (mapped-devices (list (mapped-device
-  			  (source (uuid "0c5d284e-e0c7-4dc3-bbca-f82ee6bb82e3"))
-  			  (target "system-root")
-  			  (type luks-device-mapping))))
-
-
-  ;; List of file systems to mount
-  ;; Run 'blkid' for UUIDs.
-  ;; Will change after install
-  (file-systems (cons* (file-system
-			 (mount-point "/boot/efi")
-			 (device (uuid "6919-B0C9"
-				       'fat32))
-			 (type "vfat"))
-		       (file-system
-			 (device (file-system-label "system-root"))
-			 (mount-point "/")
-			 (type "ext4")
-			 (dependencies mapped-devices))
-		       %base-file-systems))
+                (bootloader grub-bootloader)
+                (targets '("/dev/vda"))
+                (terminal-outputs '(console))))
+
+  (file-systems (cons (file-system
+                        (mount-point "/")
+                        (device "/dev/vda1")
+                        (type "ext4"))
+                      %base-file-systems))
 
   ;; Non-free
   (kernel linux)
-  (kernel-arguments '("modprobe.blacklist=noveau"
+  (kernel-arguments '("modprobe.blacklist=nouveau"
 		      ;"nvidia_drm.modeset=1"
 		      "quiet"))
   (firmware (list linux-firmware))
@@ -89,8 +68,7 @@
 	      (list 
 	      ;; NVIDIA
 	      ;(service nvidia-service-type)
-              ;(service kernel-module-loader-service-type 
-		       ;'("nvidia"))
+	      
 	      ;; systemd dependencies
 	      (service elogind-service-type)
 
@@ -124,19 +102,9 @@
 			 (using-setuid? #t)))
 
 	      ;; Networking
-	      ;(service network-manager-service-type)
+	      (service network-manager-service-type)
 	      (service wpa-supplicant-service-type)
-	      (service static-networking-service-type
-	      	       (list (static-networking
-	      		       (addresses
-	      			 (list (network-address
-	      				 (device "eth0")
-	      				 (value "10.0.2.15/24"))))
-	      		       (routes
-	      			 (list (network-route
-	      				  (destination "default")
-	      				  (gateway "10.0.2.2"))))
-	      		       (name-servers '("208.67.222.222")))))
+	      
 	      ;; dbus
 	      (service avahi-service-type)
 	      (service udisks-service-type)
@@ -145,7 +113,7 @@
 	      (service polkit-service-type)
 	      (service dbus-root-service-type)
 
-	      ;; Cleanup stayle font cache
+	      ;; Cleanup stale font cache
               fontconfig-file-system-service
 
 	      ;; Power and thermals
@@ -158,9 +126,9 @@
 	      ;; Time
 	      (service ntp-service-type)
 
-	      ;; udev
+	      ;; udev including yubikey
 	      (udev-rules-service 'pipewire-add-udev-rules pipewire)
-	      
+	      (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))
 	      ;; corpo home
 	      (service guix-home-service-type
 		       `(("worker" ,corpo-home-environment))))))