From ed775a06b6fee8788330fa07f1b9d26d5d2c4fcd Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Fri, 3 Feb 2023 00:38:33 +0300
Subject: 2023-02-03

---
 modules/nixfiles/common/nix/default.nix | 30 ++++++++++++++---------------
 modules/nixos/podman.nix                | 34 ++++++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 20 deletions(-)

(limited to 'modules')

diff --git a/modules/nixfiles/common/nix/default.nix b/modules/nixfiles/common/nix/default.nix
index 2cbb86a..2f7904a 100644
--- a/modules/nixfiles/common/nix/default.nix
+++ b/modules/nixfiles/common/nix/default.nix
@@ -27,25 +27,25 @@ with lib; {
   nix = let
     filteredInputs = filterAttrs (n: _: n != "self") inputs;
   in {
-    # https://github.com/NixOS/nix/blob/master/src/libutil/experimental-features.cc
-    extraOptions = ''
-      warn-dirty = false
-      flake-registry = ${inputs.flake-registry}/flake-registry.json
-      extra-experimental-features = ca-derivations
-      extra-experimental-features = flakes
-      extra-experimental-features = nix-command
-      extra-experimental-features = recursive-nix
-      keep-derivations = ${
+    settings = {
+      # https://github.com/NixOS/nix/blob/master/src/libutil/experimental-features.cc
+      experimental-features = concatStringsSep " " [
+        "ca-derivations"
+        "flakes"
+        "nix-command"
+        "recursive-nix"
+      ];
+      keep-derivations =
         if this.isHeadful
         then "true"
-        else "false"
-      }
-      keep-outputs = ${
+        else "false";
+      keep-outputs =
         if this.isHeadful
         then "true"
-        else "false"
-      }
-    '';
+        else "false";
+      flake-registry = "${inputs.flake-registry}/flake-registry.json";
+      warn-dirty = false;
+    };
 
     nixPath =
       mapAttrsToList (n: v: "${n}=${v}") filteredInputs
diff --git a/modules/nixos/podman.nix b/modules/nixos/podman.nix
index 1c5378b..cda8a4b 100644
--- a/modules/nixos/podman.nix
+++ b/modules/nixos/podman.nix
@@ -31,11 +31,35 @@ in {
 
     my.extraGroups = ["podman"];
 
-    hm.programs.bash = {
-      shellAliases.p = "${pkgs.podman}/bin/podman";
-      initExtra = mkAfter ''
-        _complete_alias p __start_podman podman
-      '';
+    hm = {
+      xdg.configFile = {
+        # This removes a really annoying registry search. 100% of the time I
+        # would need to look up stuff from the Docker and not Quay!
+        "containers/registries.conf".text = ''
+          [registries.search]
+          registries = ["docker.io"]
+        '';
+
+        # As for plain OverlayFS in Podman over ZFS[1]... I guess we are waiting
+        # for Podman to catch up now.
+        #
+        # [1]: https://github.com/openzfs/zfs/pull/14070#issuecomment-1309116666
+        "containers/storage.conf".text = optionalString config.boot.zfs.enabled ''
+          [storage]
+          driver = "overlay"
+
+          [storage.options]
+          mount_program = "${pkgs.fuse-overlayfs}/bin/fuse-overlayfs"
+          mountopt = "noatime,nodev,nosuid"
+        '';
+      };
+
+      programs.bash = {
+        shellAliases.p = "${pkgs.podman}/bin/podman";
+        initExtra = mkAfter ''
+          _complete_alias p __start_podman podman
+        '';
+      };
     };
   };
 }
-- 
cgit 1.4.1