From ab13ec8b9a3b6f5402662a5de2a655c899d7e39c Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Tue, 18 May 2021 20:42:53 -0500
Subject: [PATCH] kube3d: init (WIP)

---
 machines/sruxps/home.nix      |  2 ++
 modules/virtualisation.nix    |  6 +++++-
 src/machines/sruxps/home.nw   |  2 ++
 src/modules/virtualisation.nw | 10 +++++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/machines/sruxps/home.nix b/machines/sruxps/home.nix
index ef60525e..08536d1d 100644
--- a/machines/sruxps/home.nix
+++ b/machines/sruxps/home.nix
@@ -67,6 +67,8 @@
     renderizer
     scc
     docker-credential-helpers
+    k3s
+    kube3d
     kubectx
     stern
     zoom-us
diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix
index dfe193e6..729914a1 100644
--- a/modules/virtualisation.nix
+++ b/modules/virtualisation.nix
@@ -1,7 +1,11 @@
 { config, lib, pkgs, ... }:
 {
-  environment.systemPackages = lib.optionals config.virtualisation.podman.enable [ pkgs.crun ];
+  environment.systemPackages = lib.optionals config.virtualisation.podman.enable (with pkgs; [ crun tini ] );
   virtualisation = {
+    containers.containersConf.extraConfig = ''
+      [containers]
+      init_path = "${pkgs.tini}/bin/tini"
+    '';
     docker = {
       enable = lib.mkDefault false;
       liveRestore = lib.mkDefault false;
diff --git a/src/machines/sruxps/home.nw b/src/machines/sruxps/home.nw
index a4c66f73..5a6226bc 100644
--- a/src/machines/sruxps/home.nw
+++ b/src/machines/sruxps/home.nw
@@ -144,6 +144,8 @@ docker-compose
 \newthought{Install some convenient Kubernetes tools.}
 
 <<Install some user packages>>=
+k3s
+kube3d
 kubectx
 stern
 @
diff --git a/src/modules/virtualisation.nw b/src/modules/virtualisation.nw
index 8e665928..529a8743 100644
--- a/src/modules/virtualisation.nw
+++ b/src/modules/virtualisation.nw
@@ -3,8 +3,12 @@
 <<modules/virtualisation.nix>>=
 { config, lib, pkgs, ... }:
 {
-  <<Install crun>>
+  <<Install crun and tini>>
   virtualisation = {
+    containers.containersConf.extraConfig = ''
+      [containers]
+      init_path = "${pkgs.tini}/bin/tini"
+    '';
     <<Configure Docker>>
     <<Configure Podman>>
   };
@@ -33,8 +37,8 @@ It seems there is a bug in podman such that it doesn't properly handle
   WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf
 \end{minted}
 
-<<Install crun>>=
-environment.systemPackages = lib.optionals config.virtualisation.podman.enable [ pkgs.crun ];
+<<Install crun and tini>>=
+environment.systemPackages = lib.optionals config.virtualisation.podman.enable (with pkgs; [ crun tini ] );
 @
 
 Install Podman by default, if the Docker daemon is disabled.