guix:(system) Update services & containers

1 files changed, 24 insertions, 25 deletions

diff --git a/guix/system-create.scm b/guix/system-create.scm
index de30368..bd646be 100644
--- a/guix/system-create.scm
+++ b/guix/system-create.scm
@@ -8,10 +8,10 @@
   #:use-module (gnu system)
   #:use-module (gnu system setuid)
   #:use-module (gnu system nss)
+  #:use-module (gnu services docker)
   #:use-module (nongnu packages linux)
   #:use-module (nongnu system linux-initrd)
   #:use-module (rosenthal services networking)
-  #:use-module (rosenthal services dns)
   #:export (system-create))
 
 (use-service-modules cups desktop networking ssh xorg docker guix
@@ -65,16 +65,15 @@
    (services
     (append (list
 	     (service docker-service-type)
+	     (service containerd-service-type)
 	     (service libvirt-service-type
                       (libvirt-configuration
                        (unix-sock-group "libvirt")
                        (tls-port "16555")))
 	     ;; Networking services
 	     (service tailscale-service-type)
-	     (service iwd-service-type)
-	     (service network-manager-service-type
-		      (network-manager-configuration
-		       (shepherd-requirement '(iwd))))
+	     (service wpa-supplicant-service-type) ;; Needed by NetworkManager
+	     (service network-manager-service-type)
 
 	     (service transmission-daemon-service-type
 		      (transmission-daemon-configuration
@@ -152,26 +151,26 @@
 	    (if (string= hostname "zeus")
 		(list
 		 (service oci-container-service-type
-		      (list
-		       (oci-container-configuration
-			(image "ollama/ollama:rocm")
-			(network "host")
-			(ports
-			 '(("11434" . "11434")))
-			(volumes
-			 '(("/ollama" . "/root/.ollama"))))
-		       (oci-container-configuration
-			(image "jellyfin/jellyfin")
-			(network "host")
-			(volumes
-			 '(("/home/jelly/config" . "/config")
-			   ("/home/jelly/cache" . "/cache")
-			   ("/hdd" . "/media"))))
-		       (oci-container-configuration
-			(image "rssbridge/rss-bridge")
-			(network "host")
-			(ports
-			 '(("3000" . "80")))))))
+			  (list
+			   (oci-container-configuration
+			    (image "ollama/ollama:rocm")
+			    (network "host")
+			    (ports
+			     '(("11434" . "11434")))
+			    (volumes
+			     '(("/ollama" . "/root/.ollama"))))
+			   (oci-container-configuration
+			    (image "jellyfin/jellyfin")
+			    (network "host")
+			    (volumes
+			     '(("/home/jelly/config" . "/config")
+			       ("/home/jelly/cache" . "/cache")
+			       ("/hdd" . "/media"))))
+			   (oci-container-configuration
+			    (image "rssbridge/rss-bridge")
+			    (network "host")
+			    (ports
+			     '(("3000" . "80")))))))
 		;; For everything else
 		(list))))