1 files changed, 12 insertions(+), 4 deletions(-)

M config.scm

@@ 14,14 14,18 @@
  (gnu system nss)
  (guix derivations)
  (guix store)
+ (guix transformations)
  (guix monads)
  (guix utils)
  (guix packages)
  (guix build-system gnu)
+ (gnu system accounts)
  (ruther services system)
  (ruther services bind)
  (ruther bootloader grub))
-(use-service-modules desktop sddm xorg base nix pm virtualization vpn sound dbus cups docker security-token)
+(use-service-modules desktop sddm xorg base nix pm virtualization vpn
+                     sound dbus cups containers security-token networking
+                     ssh)
 (use-package-modules gnome package-management shells networking wm
                      vim wget curl bash compression glib
                      linux embedded finance python-xyz freedesktop


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


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