diff --git a/archachatina.nix b/archachatina.nix index ad2b52a..43942ae 100644 --- a/archachatina.nix +++ b/archachatina.nix @@ -45,8 +45,7 @@ services.thermald.enable = true; - virtualisation.docker.enable = true; - users.extraUsers.gebner.extraGroups = [ "docker" "libvirtd" ]; + users.extraUsers.gebner.extraGroups = [ "libvirtd" ]; virtualisation.virtualbox.host.enable = true; diff --git a/common-headless.nix b/common-headless.nix index 6805f15..cddfaa8 100644 --- a/common-headless.nix +++ b/common-headless.nix @@ -39,6 +39,11 @@ drivers = [ pkgs.hplip ]; }; + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; + boot.kernel.sysctl = { "kernel.perf_event_paranoid" = "0"; "kernel.kptr_restrict" = pkgs.lib.mkForce "0"; diff --git a/decoysnail.nix b/decoysnail.nix index 6987b22..6429056 100644 --- a/decoysnail.nix +++ b/decoysnail.nix @@ -35,12 +35,6 @@ services.thermald.enable = true; - virtualisation.docker = { - enable = true; - storageDriver = "overlay2"; - }; - users.extraUsers.gebner.extraGroups = [ "docker" ]; - hardware.opengl = { extraPackages = with pkgs; [ beignet ]; driSupport32Bit = true; diff --git a/petalius.nix b/petalius.nix index 01126a0..ae4bbb2 100644 --- a/petalius.nix +++ b/petalius.nix @@ -61,12 +61,7 @@ unison ]; - virtualisation.docker = { - enable = true; - storageDriver = "overlay2"; - }; - users.extraUsers.gebner.extraGroups = [ "docker" "libvirtd" "video" "input" "dialout" ]; - + users.extraUsers.gebner.extraGroups = [ "libvirtd" ]; virtualisation.libvirtd.enable = true; virtualisation.virtualbox.host.enable = true;