From 697d216397cdd2b296a2a1bf2afdd5eb00f612de Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 30 Dec 2024 01:25:53 -0700
Subject: [PATCH] [NixOS] Reenable serviec that enabled cdi for k3s containerd

enabel
---
 nixos/k3s.nix | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/nixos/k3s.nix b/nixos/k3s.nix
index 4c0a8ee3..d5babdfd 100644
--- a/nixos/k3s.nix
+++ b/nixos/k3s.nix
@@ -48,16 +48,16 @@ in {
       enableGarbageCollect = true;
     };
 
-    virtualisation.containerd = {
-      enable = false;
-      settings = {
-        plugins."io.containerd.grpc.v1.cri" = {
-          enable_cdi = true;
-          cdi_spec_dirs = [ "/var/run/cdi" ];
-          cni.bin_dir = "${plugins-path}/bin";
-        };
-      };
-    };
+    # virtualisation.containerd = {
+    #   enable = false;
+    #   settings = {
+    #     plugins."io.containerd.grpc.v1.cri" = {
+    #       enable_cdi = true;
+    #       cdi_spec_dirs = [ "/var/run/cdi" ];
+    #       cni.bin_dir = "${plugins-path}/bin";
+    #     };
+    #   };
+    # };
 
     virtualisation.containers = {
       containersConf.cniPlugins = [
@@ -74,20 +74,20 @@ in {
         # unless I bodge their path into the environment.
         environment.LD_LIBRARY_PATH = "${config.hardware.nvidia.package}/lib";
       };
-      # k3s-containerd-setup = {
-      #     # `virtualisation.containerd.settings` has no effect on k3s' bundled containerd.
-      #     serviceConfig.Type = "oneshot";
-      #     requiredBy = ["k3s.service"];
-      #     before = ["k3s.service"];
-      #     script = ''
-      #       cat << EOF > /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
-      #       {{ template "base" . }}
+      k3s-containerd-setup = {
+          # `virtualisation.containerd.settings` has no effect on k3s' bundled containerd.
+          serviceConfig.Type = "oneshot";
+          requiredBy = ["k3s.service"];
+          before = ["k3s.service"];
+          script = ''
+            cat << EOF > /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
+            {{ template "base" . }}
 
-      #       [plugins]
-      #       "io.containerd.grpc.v1.cri".enable_cdi = true
-      #       EOF
-      #     '';
-      # };
+            [plugins]
+            "io.containerd.grpc.v1.cri".enable_cdi = true
+            EOF
+          '';
+      };
     };
 
     systemd.services.mount-railbird-bucket = {