1 files changed, 14 insertions(+), 9 deletions(-)

M config.scm

@@ 25,12 25,13 @@
  (ruther bootloader grub))
 (use-service-modules desktop sddm xorg base nix pm virtualization vpn
                      sound dbus cups containers security-token networking
-                     ssh)
+                     ssh databases linux docker)
 (use-package-modules gnome package-management shells networking wm
                      vim wget curl bash compression glib
                      linux embedded finance python-xyz freedesktop
                      python-build haskell-apps commencement
-                     polkit firmware)
+                     polkit firmware databases guile security-token
+                     docker)
 
 (define wireshark-patched
   (package/inherit wireshark


@@ 58,7 59,7 @@
    (supplementary-groups '("wheel" "netdev"
                            "audio" "video"
                            "libvirt" "dialout"
-                           "kvm" "cgroup"))
+                           "kvm" "docker"))
    (shell (file-append zsh "/bin/zsh"))))
 
 ;; Obsolete, only useful if just part of package's udev rules is desirable


@@ 89,12 90,16 @@
 
 (define %ruther/container-virt-services
   (list
-   (service rootless-podman-service-type
-            (rootless-podman-configuration
-              (subgids
-               (list (subid-range (name "ruther"))))
-              (subuids
-               (list (subid-range (name "ruther"))))))
+   (service containerd-service-type)
+   (service docker-service-type)
+   ;; (service rootless-podman-service-type
+   ;;          (rootless-podman-configuration
+   ;;            (subgids
+   ;;             (list (subid-range (name "ruther"))
+	 ;;       (subid-range (name "fbw"))))
+   ;;            (subuids
+   ;;             (list (subid-range (name "ruther"))
+	 ;;       (subid-range (name "fbw"))))))
    (service libvirt-service-type)
    (service qemu-binfmt-service-type
             (qemu-binfmt-configuration