home

commit 51060348683f38ea6b5eb074464d24604a31984f
parent 65b1e8c6e7114ffc2eb0b90b0c0db742189402b5
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 10 Mar 2021 18:37:48 +0100

nix: disable containerd service…

… it is now available upstream.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
flake.nix
 | 
2
+-
M
systems/modules/profiles/docker.nix
 | 
2
+-
M
systems/modules/virtualisation/default.nix
 | 
3
++-

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -324,7 +324,7 @@
       # Import the modules exported by this flake.
       # containerd, buildkit are interesting module to export from here
       nixosModules = {
-        containerd = import ./systems/modules/virtualisation/containerd.nix;
+        # containerd = import ./systems/modules/virtualisation/containerd.nix;
         buildkit = import ./systems/modules/virtualisation/buildkit.nix;
       };
 
diff --git a/systems/modules/profiles/docker.nix b/systems/modules/profiles/docker.nix
@@ -24,7 +24,7 @@ in
     virtualisation = {
       containerd = {
         enable = true;
-        autostart = false;
+        #autostart = false;
       };
       buildkitd = {
         enable = true;
diff --git a/systems/modules/virtualisation/default.nix b/systems/modules/virtualisation/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./buildkit.nix
-    ./containerd.nix
+    # Containerd is now a module upstream
+    # ./containerd.nix
   ];
 }