git: use zdiff3

flake.lock

@@ -244,11 +244,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699025595,
-        "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=",
+        "lastModified": 1699345318,
+        "narHash": "sha256-JxMtX7/2PdxSUXu38S8ACH71TcZULiztlkv+elEq7og=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d",
+        "rev": "76e7c05f7d3d5ffac219450af824043da52af1cc",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1699187447,
-        "narHash": "sha256-cWfBNsk8vIYSONHqDDyoKYv21XTjsIK1AA+iSc1hzQk=",
+        "lastModified": 1699346628,
+        "narHash": "sha256-eAG29Q53SO9XxJIxIMPSHlORTrEH3NFzsXhJMwTRo4M=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "a8aebcff50ca5be120fbb52ca59348eaa44f031f",
+        "rev": "3ca967387c49c754561c3b11a574797504d40f38",
         "type": "github"
       },
       "original": {
@@ -312,11 +312,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699187801,
-        "narHash": "sha256-nIejBzD2c1glzaKKe9Z5TKFpen9hpOO+X/dD9P4xSRw=",
+        "lastModified": 1699356808,
+        "narHash": "sha256-Gpf4jNIKpyHj4Svo1zQzKkkxnGTmQA6ahTM2W6GRgec=",
         "ref": "refs/heads/master",
-        "rev": "8c73fb5c9087632da9a64d40898970c63bcba511",
-        "revCount": 564,
+        "rev": "e7c9d61793a4c323ae1b85e43617873326ae919d",
+        "revCount": 566,
         "type": "git",
         "url": "https://git.kempkens.io/daniel/nix-overlay"
       },
@@ -363,11 +363,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1699128932,
-        "narHash": "sha256-4Hn/fpR/FRucpXQqMI0OSgxiu2ImowmR0dThAycPt/4=",
+        "lastModified": 1699263391,
+        "narHash": "sha256-gl4gNUR1GjIfI7aRYUr024nrK3Sxx3W3dRuS4LB56Zg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0d2d729bf7091df906a78b69f90620f933ea963f",
+        "rev": "cac8c76f21fccba39376504e18c23f7e18fd8419",
         "type": "github"
       },
       "original": {
@@ -379,11 +379,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699155732,
-        "narHash": "sha256-Wg4RmOGUEO4YCF0fEc/qiQ/3+BGC/f0qywIE8xEkIpY=",
+        "lastModified": 1699186365,
+        "narHash": "sha256-Pxrw5U8mBsL3NlrJ6q1KK1crzvSUcdfwb9083sKDrcU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "15492ddc2974ba426ea7e17116ea7aa44fc96dcd",
+        "rev": "a0b3b06b7a82c965ae0bb1d59f6e386fe755001d",
         "type": "github"
       },
       "original": {
@@ -454,11 +454,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1698852633,
-        "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=",
+        "lastModified": 1699271226,
+        "narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0",
+        "rev": "ea758da1a6dcde6dc36db348ed690d09b9864128",
         "type": "github"
       },
       "original": {

home/programs/git.nix

@@ -40,6 +40,10 @@
         whitespace = "fix";
       };
 
+      merge = {
+        conflictStyle = "zdiff3";
+      };
+
       rerere = {
         enabled = true;
       };

home/programs/nvim/plugins.nix

@@ -29,12 +29,12 @@ in
   };
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2023-11-03";
+    version = "2023-11-06";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "e8a413b1a29f05bb556a804ebee990eb54479586";
-      sha256 = "0wlkpbxrpy4m1n1s5vv368x43zc19zi9s7962hljr5a4qink7zaa";
+      rev = "8e18eb9ba849d737acac1873cd78fc8058c1700a";
+      sha256 = "0s40jdg2z1wqb5wy0i4d31mrn9gw9136hq8kkwyqif43lgizz4h3";
       fetchSubmodules = false;
     };
   };
@@ -117,12 +117,12 @@ in
   };
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2023-11-05";
+    version = "2023-11-07";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "b3d2c36254aa79fe531ac94c475a5a57580d2907";
-      sha256 = "0pb5f2q2wp4zsz2a7qsxcv2zm7bscr4jny1anrj3r15ikin4yl3p";
+      rev = "9a746b4b6a1ef215943f07e6aa2ec35fb14097d4";
+      sha256 = "1r3g0d6lmj64labcnfwqv00gd4i0a5s8qg4mkb1qgcf0q4kvmhaz";
       fetchSubmodules = false;
     };
   };
@@ -161,12 +161,12 @@ in
   };
   telescope-nvim = buildVimPlugin {
     pname = "telescope.nvim";
-    version = "2023-10-23";
+    version = "2023-11-06";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "4522d7e3ea75ffddabdc39957168a8a7060b5df0";
-      sha256 = "143bdqxfzlfbjrd80pw4wkz95szp21qs1zn7i230sdavvrq00b3b";
+      rev = "20bf20500c95208c3ac0ef07245065bf94dcab15";
+      sha256 = "096vv98xxdqy96ipz6lbricfr74bkc3r58x1si1816lnm0j896r5";
       fetchSubmodules = false;
     };
   };
@@ -219,12 +219,12 @@ in
   };
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2023-11-04";
+    version = "2023-11-06";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "b44737605807023d32e6310b87ba69f4dbf10e0e";
-      sha256 = "1dhq2ai09ky724sfdb2lalmbh5xkj53w5v2yrpbybwpw0sxfaa1l";
+      rev = "37457f268af5cd6765e589b0dcd7cbd192d8da00";
+      sha256 = "0pspyr4ppvy2zv6iqa4lnicivrhivmky00y28zkkpchji14ybm36";
       fetchSubmodules = false;
     };
   };
@@ -318,12 +318,12 @@ in
   };
   nvim-cmp = buildVimPlugin {
     pname = "nvim-cmp";
-    version = "2023-10-25";
+    version = "2023-11-06";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "51260c02a8ffded8e16162dcf41a23ec90cfba62";
-      sha256 = "0h5n8ks34vxr2b17vddrv4vgjyr649bl7i839awpad21x146krkz";
+      rev = "0b751f6beef40fd47375eaf53d3057e0bfa317e4";
+      sha256 = "1qp7s2iam9zzdlw5sgkk6c623z7vjgga0rcg63ja0f836l90grba";
       fetchSubmodules = false;
     };
   };
@@ -395,12 +395,12 @@ in
   };
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2023-11-04";
+    version = "2023-11-07";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "0bbe83830be5a07a1161bb1a23d7280310656177";
-      sha256 = "08y5xwf8h79l8ms3pjynaclvi1i55jzz5ffbq31cnilm98xsars8";
+      rev = "161d95bfbb1ad1a2b89ba2ea75ca1b5e012a111e";
+      sha256 = "0ilwbkp9s9pr9qsvc98a527fx89r7zg5sfj3db8zclsa14y49m0q";
       fetchSubmodules = false;
     };
   };

home/programs/scripts/mp4concat

@@ -1,13 +1,20 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 
-tmpfile="_mp4-concat.tmp"
-printf '' >"$tmpfile"
+tmpext="_mp4-concat.tmp.ts"
+TMP_FILES=()
 
 for f in "$@"; do
-  echo "file '$f'" >>"$tmpfile"
+  TMP_FILES+=("$f$tmpext")
+  ffmpeg -i "$f" -c copy -bsf:v h264_mp4toannexb -f mpegts "$f$tmpext"
 done
 
-ffmpeg -f concat -safe 0 -i "$tmpfile" -c copy mp4concat_output.mp4
-rm -f "$tmpfile"
+concat_files=$(printf "|%s" "${TMP_FILES[@]}")
+concat_files=${concat_files:1}
+
+ffmpeg -i "concat:$concat_files" -c copy -bsf:a aac_adtstoasc "mp4concat_${RANDOM}.mp4"
+
+for f in "${TMP_FILES[@]}"; do
+  rm "$f"
+done