From a3ebd243a8155c79a3bae7f57ea92a23550d83d1 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Thu, 6 Apr 2023 13:52:54 +0200
Subject: [PATCH] Use podman for t3 docs rendering but docker-compose
 everywhere else

podman-compose has some issues on ubuntu and with volumes.
I'll keep docker-compose.

But I prefer podman for t3docs rendering as it doesn't fuck up the file
permissions.
---
 home/packages.nix                               |  5 ++---
 home/packages/custom/default.nix                |  4 +---
 .../typo3-documentation-rendering/default.nix   | 17 ++++++-----------
 systems/hikari/readme.rst                       |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/home/packages.nix b/home/packages.nix
index 004aed6..fd28c7f 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -40,6 +40,8 @@ with pkgs; [
   kcachegrind
   geckodriver
 
+  docker-compose
+
   # In order to pull binaries from their.
   # E.g. phps: https://github.com/fossar/nix-phps#how-to-use
   cachix
@@ -76,9 +78,6 @@ with pkgs; [
 
   gtkpod
 
-  podman
-  podman-compose
-
 ] else [
   # hikari 2
 
diff --git a/home/packages/custom/default.nix b/home/packages/custom/default.nix
index 2288904..8d170ab 100644
--- a/home/packages/custom/default.nix
+++ b/home/packages/custom/default.nix
@@ -8,9 +8,7 @@
   (callPackage ./update-system { })
   (callPackage ./nextcloud-sync/from-local.nix { })
   (callPackage ./nextcloud-sync/from-remote.nix { })
-  (callPackage ./typo3-documentation-rendering {
-    inherit ownLib;
-  })
+  (callPackage ./typo3-documentation-rendering { })
   (callPackage ./build-phpactor { })
   (callPackage ./project {
     inherit ownLib;
diff --git a/home/packages/custom/typo3-documentation-rendering/default.nix b/home/packages/custom/typo3-documentation-rendering/default.nix
index 7fc3ed3..03294bd 100644
--- a/home/packages/custom/typo3-documentation-rendering/default.nix
+++ b/home/packages/custom/typo3-documentation-rendering/default.nix
@@ -1,28 +1,23 @@
 {
   writeShellApplication,
-  ownLib,
   podman
 }:
 
-let
-  usePodman = ownLib.onHikari {};
-  runner = if usePodman then "podman" else "docker";
-  image = (if usePodman then "docker.io/" else "") + "t3docs/render-documentation:latest";
-  runtimeInputs = if usePodman then [ podman ] else [ ];
-
-in writeShellApplication {
+writeShellApplication {
   name = "custom-typo3-render-documentation";
 
-  inherit runtimeInputs;
+  runtimeInputs = [
+    podman
+  ];
 
   # See: https://t3docs.github.io/DRC-The-Docker-Rendering-Container/07-To-be-sorted/quickstart.html#build-html-with-plain-docker-commands
   text = ''
     mkdir -p Documentation-GENERATED-temp
-    ${runner} \
+    podman \
       run --rm \
       -v "$(pwd)":/PROJECT:ro \
       -v "$(pwd)/Documentation-GENERATED-temp":/RESULT \
-      ${image} \
+      docker.io/t3docs/render-documentation:latest \
       makehtml
   '';
 }
diff --git a/systems/hikari/readme.rst b/systems/hikari/readme.rst
index 63bdd01..be93e24 100644
--- a/systems/hikari/readme.rst
+++ b/systems/hikari/readme.rst
@@ -32,4 +32,4 @@ See: https://github.com/NixOS/nixos-hardware
 TODOs
 -----
 
-* Add docker-compose / podman-compose for Elasticsearch, proxy, solr.
+* Add docker-compose for Elasticsearch, proxy, solr.