From 36c1e554d1fa399bbb5f23ca75e03b614d0a6d12 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 5 May 2023 09:49:58 +0200
Subject: [PATCH] try to fix podman + zfs

---
 nixos/machines/chungus/configuration.nix | 6 ++++++
 nixos/machines/chungus/disko-config.nix  | 9 +++++++++
 nixos/machines/chungus/tdarr.nix         | 2 +-
 nixos/system/desktop/packages.nix        | 2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/nixos/machines/chungus/configuration.nix b/nixos/machines/chungus/configuration.nix
index e8cefd9..643790e 100644
--- a/nixos/machines/chungus/configuration.nix
+++ b/nixos/machines/chungus/configuration.nix
@@ -48,6 +48,12 @@
   networking.hostId = "e439b116";
   services.zfs.autoSnapshot.enable = true;
 
+  #virtualisation.containers.storage.settings = {
+  #  # fixes: Error: 'overlay' is not supported over zfs, a mount_program is required: backing file system is unsupported for this graph driver
+  #  storage.options.mount_program = "${pkgs.fuse-overlayfs}/bin/fuse-overlayfs";
+  #};
+  virtualisation.podman.extraPackages = [ pkgs.zfs ]; # make sure /var/lib/containers/storage is a zfs dataset
+
   sops.defaultSopsFile = ../../secrets/chungus.yaml;
 
   networking.hostName = "chungus";
diff --git a/nixos/machines/chungus/disko-config.nix b/nixos/machines/chungus/disko-config.nix
index a2a4517..02be990 100644
--- a/nixos/machines/chungus/disko-config.nix
+++ b/nixos/machines/chungus/disko-config.nix
@@ -171,6 +171,15 @@ in
               compression = "lz4";
             };
           };
+          "container" = {
+            type = "zfs_fs";
+            mountpoint = "/var/lib/containers/storage"; # needed for podman
+            options = {
+              mountpoint = "legacy";
+              compression = "lz4";
+              acltype = "posixacl"; # needed for podman
+            };
+          };
           "robi" = {
             type = "zfs_fs";
             mountpoint = "/robi";
diff --git a/nixos/machines/chungus/tdarr.nix b/nixos/machines/chungus/tdarr.nix
index df59836..ccc1d0b 100644
--- a/nixos/machines/chungus/tdarr.nix
+++ b/nixos/machines/chungus/tdarr.nix
@@ -22,7 +22,7 @@
 
   # https://docs.tdarr.io/docs/installation/docker/run-compose
   virtualisation.oci-containers = {
-    #backend = "podman";
+    # backend = "podman";
     containers.tdarr = {
       volumes = [
         "/srv/tdarr/server:/app/server"
diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix
index 08bf382..6a0deac 100644
--- a/nixos/system/desktop/packages.nix
+++ b/nixos/system/desktop/packages.nix
@@ -331,6 +331,6 @@ in
 
     ] ++ (map pandocScript (lib.cartesianProductOfSets {
       inputFormat = [ "man" "markdown" "mediawiki" ];
-      outputFormat = [ "mediawiki" "docbook5" "html5" "man" "jira" ];
+      outputFormat = [ "mediawiki" "docbook5" "html5" "man" "jira" "markdown" ];
     }));
 }