From eefe9812a05444db30b7cb7b004d4ffddf038d2a Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Tue, 18 May 2021 20:42:53 -0500
Subject: [PATCH] [sruxps] feat: add kube3d

---
 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 4f4bb0a4..2ed767fe 100644
--- a/machines/sruxps/home.nix
+++ b/machines/sruxps/home.nix
@@ -58,7 +58,9 @@
     scc
     docker-credential-helpers
     # TODO: podman-compose
+    k3s
     krew
+    kube3d
     kubectl
     kubectx
     kubelogin
diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix
index 089e0d1e..bd07fd91 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 4f382ceb..17b2b9e8 100644
--- a/src/machines/sruxps/home.nw
+++ b/src/machines/sruxps/home.nw
@@ -143,7 +143,9 @@ docker-compose
 \newthought{Install some convenient Kubernetes tools.}
 
 <<Install some user packages>>=
+k3s
 krew
+kube3d
 kubectl
 kubectx
 kubelogin
diff --git a/src/modules/virtualisation.nw b/src/modules/virtualisation.nw
index e9a6ab3f..72e0301b 100644
--- a/src/modules/virtualisation.nw
+++ b/src/modules/virtualisation.nw
@@ -4,8 +4,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>>
     <<Configure VirtualBox>>
@@ -35,8 +39,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.