commit stashed changes including:

- remove intel mod from jellyfin container
- enable tailscale service in pihole
- use latest linux kernel with unstable zsh for merlin

hosts/common/optional/docker-containers/jellyfin.nix

@@ -19,7 +19,6 @@
         environment = {
           PUID = "1000";
           PGID = "1000";
-          DOCKER_MODS = "linuxserver/mods:jellyfin-opencl-intel";
           NVIDIA_VISIBLE_DEVICES = "all";
         };
         extraOptions = [

hosts/common/optional/nixos-containers/pihole.nix

@@ -83,6 +83,8 @@ in {
         pkgs.podman-compose
       ];
 
+      services.tailscale.enable = true;
+
       virtualisation = {
         podman = {
           enable = true;

hosts/merlin/default.nix

@@ -4,6 +4,7 @@
   lib,
   config,
   outputs,
+  pkgs,
   ...
 }: let
   fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence
@@ -74,6 +75,7 @@ in {
       efi.canTouchEfiVariables = true;
       timeout = 3;
     };
+    kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
   };
 
   fileSystems."/mnt/main-ssd" = {
@@ -175,10 +177,12 @@ in {
     };
   };
 
+  # zfs config
   boot.supportedFilesystems = ["zfs"];
   boot.zfs.forceImportRoot = false;
   networking.hostId = "18aec5d7";
   boot.zfs.extraPools = ["deepzfs" "nvme-zpool"];
+  boot.zfs.package = pkgs.zfs_2_3;
 
   services.libinput.enable = true;
 }