From 4d554f50c18f9a712975f93f137f50dcc260f267 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 11 Nov 2024 19:18:30 -0700
Subject: [PATCH] [NixOS] A few more cdi/k3s fixes

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

diff --git a/nixos/k3s.nix b/nixos/k3s.nix
index 7d410a8e..1cd66bf4 100644
--- a/nixos/k3s.nix
+++ b/nixos/k3s.nix
@@ -49,6 +49,28 @@ in {
       };
     };
 
+    systemd.services = {
+      nvidia-container-toolkit-cdi-generator = {
+        # Even with `--library-search-path`, `nvidia-ctk` won't find the libs
+        # 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" . }}
+
+      #       [plugins]
+      #       "io.containerd.grpc.v1.cri".enable_cdi = true
+      #       EOF
+      #     '';
+      # };
+    };
+
     systemd.services.mount-railbird-bucket = {
       after = ["agenix.service"];
       wantedBy = [ "multi-user.target" ];
@@ -113,6 +135,7 @@ in {
 
         [plugins]
         "io.containerd.grpc.v1.cri".enable_cdi = true
+        "io.containerd.grpc.v1.cri".cdi_spec_dirs = [ "/var/run/cdi" ]
       '';
       gracefulNodeShutdown = {
         enable = true;