6 files changed, 150 insertions, 222 deletions

diff --git a/_sources/generated.json b/_sources/generated.json
index 9f755e0b..05d55bd9 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -14,7 +14,7 @@
             "owner": "gkleen",
             "repo": "afew",
             "rev": "8ef9a5b73e5d1063cf912c70027c655fb19d1109",
-            "sha256": "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=",
+            "sha256": "sha256-Wdvack+oAq88a9E6i+OcMlSNStv4dWsZstHgLao0c9g=",
             "type": "github"
         },
         "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109"
@@ -27,15 +27,15 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "1d9i5hxg6rsyy691xakr2626af7kff1ndi5av79l4iwib0qsgha8",
+            "sha256": "sha256-MLDFU+Vp11eZ7hbY1qdmN0vVk2z2BIbMxSzTbLR49OU=",
             "type": "tarball",
-            "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.0.tar.gz"
+            "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.1.tar.gz"
         },
-        "version": "2023.0"
+        "version": "2023.1"
     },
     "bpf-examples": {
         "cargoLocks": null,
-        "date": "2023-03-30",
+        "date": "2023-08-07",
         "extract": null,
         "name": "bpf-examples",
         "passthru": null,
@@ -47,11 +47,11 @@
             "name": null,
             "owner": "xdp-project",
             "repo": "bpf-examples",
-            "rev": "9ba9e7cd087c0c464d20d80900941b5e70648089",
-            "sha256": "sha256-cR02EgojNneAVbqUat7qbp5pY2JP++XCORSUwp7eYIU=",
+            "rev": "bc9df640cb9e5a541a7425ca2e66174ae22a18e3",
+            "sha256": "sha256-S7cdcxVXanj+IjCZ0ZFsLMkMzEyo3vLQsll+1KVxnvs=",
             "type": "github"
         },
-        "version": "9ba9e7cd087c0c464d20d80900941b5e70648089"
+        "version": "bc9df640cb9e5a541a7425ca2e66174ae22a18e3"
     },
     "emacs-scratch_el": {
         "cargoLocks": null,
@@ -73,26 +73,6 @@
         },
         "version": "0077334cc299aa7885f804d88f52cdb1b35caf71"
     },
-    "etebase-py": {
-        "cargoLocks": null,
-        "date": "2023-01-07",
-        "extract": null,
-        "name": "etebase-py",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "etesync",
-            "repo": "etebase-py",
-            "rev": "ea87930db5d8abed815a1123c57d06618b957028",
-            "sha256": "sha256-E7Hb7rbBCTJ+Yho4pCbBFi0E3lB9KxLuVzppgkUqmIw=",
-            "type": "github"
-        },
-        "version": "ea87930db5d8abed815a1123c57d06618b957028"
-    },
     "lesspipe": {
         "cargoLocks": null,
         "date": null,
@@ -101,11 +81,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "0xci0c575hklb5y6vybvb48938fslb9zw3mlisvspx1p3fplyzrg",
+            "sha256": "sha256-jN8x5qd9zRr0bpjGYOWfFbiXbWSDDQ8CLZJo79fnegI=",
             "type": "tarball",
-            "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.07.tar.gz"
+            "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.08.tar.gz"
         },
-        "version": "2.07"
+        "version": "2.08"
     },
     "mpv-autosave": {
         "cargoLocks": null,
@@ -208,7 +188,7 @@
     },
     "mpv-subselect": {
         "cargoLocks": null,
-        "date": "2023-02-22",
+        "date": "2023-04-23",
         "extract": null,
         "name": "mpv-subselect",
         "passthru": null,
@@ -218,12 +198,12 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "5d2fb7ab73fc0e36d44109e75c9be26bd42084e2",
-            "sha256": "sha256-8TZhrB9wjmytxA29fuCUGKZYPxsMYj8zDUjuuP0U0Dc=",
+            "rev": "a23111e181b0051854cc543a31bee4f6741183ac",
+            "sha256": "sha256-dwg8Trp6EqiNHrKVn//4V1jEwzZdwt5uFsHSyBOebGI=",
             "type": "git",
             "url": "https://github.com/CogentRedTester/mpv-sub-select"
         },
-        "version": "5d2fb7ab73fc0e36d44109e75c9be26bd42084e2"
+        "version": "a23111e181b0051854cc543a31bee4f6741183ac"
     },
     "mpv-youtube-quality": {
         "cargoLocks": null,
@@ -252,11 +232,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "0zfgadfvyfyby6ny3kllkyvpfgvhlyik7h82lr62z6l4s6g6fdcm",
+            "sha256": "18p3n1p55qchf32khldcffzrcbz4lbz67ylrx2a6hxwpy97mp462",
             "type": "tarball",
-            "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.3.0.tar.gz"
+            "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.4.0.tar.gz"
         },
-        "version": "1.3.0"
+        "version": "1.4.0"
     },
     "postfwd": {
         "cargoLocks": null,
@@ -266,7 +246,7 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "0js9lxzzc65plh9zdrgysxdnh11gazwwq6d8qyllq945nkxb99x6",
+            "sha256": "sha256-pqe0+rSFJEypx6gZzPlXLwRoW9f+5fYTpLcY9n+nSUs=",
             "type": "tarball",
             "url": "https://github.com/postfwd/postfwd/archive/refs/tags/v2.03.tar.gz"
         },
@@ -280,11 +260,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "0j6dd707wgcv18ma4i7yhv0rmj7agm8xcvx71dxxh2zg5yrfzlyh",
+            "sha256": "sha256-mA84Bnq5JF0BGfqHhcCzTef5nDotLgQuiyg3/zOPqTE=",
             "type": "tarball",
-            "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.2.tar.gz"
+            "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.3.tar.gz"
         },
-        "version": "0.3.2"
+        "version": "0.3.3"
     },
     "psql-versioning": {
         "cargoLocks": null,
@@ -313,7 +293,7 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "0a07q0asdjck96yipdp0l8v59yc3rfsywkchxgff7hjvlfn540qv",
+            "sha256": "sha256-GwNSrKNbwuPc65BN7rXLg/lUNqLgthu9SZPJphXAByg=",
             "type": "tarball",
             "url": "https://github.com/matusnovak/prometheus-smartctl/archive/refs/tags/v2.2.0.tar.gz"
         },
@@ -321,7 +301,7 @@
     },
     "v4l2loopback": {
         "cargoLocks": null,
-        "date": "2023-02-19",
+        "date": "2023-05-14",
         "extract": null,
         "name": "v4l2loopback",
         "passthru": null,
@@ -333,11 +313,11 @@
             "name": null,
             "owner": "umlaeute",
             "repo": "v4l2loopback",
-            "rev": "fb410fc7af40e972058809a191fae9517b9313af",
-            "sha256": "sha256-0WbxavX/NzHlb0AKZDVjie1KNqGpLC9tTE/j4av+ePc=",
+            "rev": "9ba7e294ea6f45410a15f192381d4918e8df4f02",
+            "sha256": "sha256-rt5EfbwVpwDuMJgFxNefutSj+i9rf7TiZGUCOap9hrI=",
             "type": "github"
         },
-        "version": "fb410fc7af40e972058809a191fae9517b9313af"
+        "version": "9ba7e294ea6f45410a15f192381d4918e8df4f02"
     },
     "xcompose": {
         "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 6f2ea575..36346cbd 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -4,67 +4,55 @@
   afew = {
     pname = "afew";
     version = "8ef9a5b73e5d1063cf912c70027c655fb19d1109";
-    src = fetchFromGitHub ({
+    src = fetchFromGitHub {
       owner = "gkleen";
       repo = "afew";
       rev = "8ef9a5b73e5d1063cf912c70027c655fb19d1109";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = true;
-      sha256 = "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=";
-    });
+      sha256 = "sha256-Wdvack+oAq88a9E6i+OcMlSNStv4dWsZstHgLao0c9g=";
+    };
     date = "2021-05-30";
   };
   batman-adv = {
     pname = "batman-adv";
-    version = "2023.0";
+    version = "2023.1";
     src = fetchTarball {
-      url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.0.tar.gz";
-      sha256 = "1d9i5hxg6rsyy691xakr2626af7kff1ndi5av79l4iwib0qsgha8";
+      url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.1.tar.gz";
+      sha256 = "sha256-MLDFU+Vp11eZ7hbY1qdmN0vVk2z2BIbMxSzTbLR49OU=";
     };
   };
   bpf-examples = {
     pname = "bpf-examples";
-    version = "9ba9e7cd087c0c464d20d80900941b5e70648089";
-    src = fetchFromGitHub ({
+    version = "bc9df640cb9e5a541a7425ca2e66174ae22a18e3";
+    src = fetchFromGitHub {
       owner = "xdp-project";
       repo = "bpf-examples";
-      rev = "9ba9e7cd087c0c464d20d80900941b5e70648089";
+      rev = "bc9df640cb9e5a541a7425ca2e66174ae22a18e3";
       fetchSubmodules = true;
-      sha256 = "sha256-cR02EgojNneAVbqUat7qbp5pY2JP++XCORSUwp7eYIU=";
-    });
-    date = "2023-03-30";
+      sha256 = "sha256-S7cdcxVXanj+IjCZ0ZFsLMkMzEyo3vLQsll+1KVxnvs=";
+    };
+    date = "2023-08-07";
   };
   emacs-scratch_el = {
     pname = "emacs-scratch_el";
     version = "0077334cc299aa7885f804d88f52cdb1b35caf71";
-    src = fetchFromGitHub ({
+    src = fetchFromGitHub {
       owner = "ffevotte";
       repo = "scratch.el";
       rev = "0077334cc299aa7885f804d88f52cdb1b35caf71";
       fetchSubmodules = false;
       sha256 = "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=";
-    });
+    };
     date = "2015-09-10";
   };
-  etebase-py = {
-    pname = "etebase-py";
-    version = "ea87930db5d8abed815a1123c57d06618b957028";
-    src = fetchFromGitHub ({
-      owner = "etesync";
-      repo = "etebase-py";
-      rev = "ea87930db5d8abed815a1123c57d06618b957028";
-      fetchSubmodules = false;
-      sha256 = "sha256-E7Hb7rbBCTJ+Yho4pCbBFi0E3lB9KxLuVzppgkUqmIw=";
-    });
-    date = "2023-01-07";
-  };
   lesspipe = {
     pname = "lesspipe";
-    version = "2.07";
+    version = "2.08";
     src = fetchTarball {
-      url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.07.tar.gz";
-      sha256 = "0xci0c575hklb5y6vybvb48938fslb9zw3mlisvspx1p3fplyzrg";
+      url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.08.tar.gz";
+      sha256 = "sha256-jN8x5qd9zRr0bpjGYOWfFbiXbWSDDQ8CLZJo79fnegI=";
     };
   };
   mpv-autosave = {
@@ -83,62 +71,62 @@
   mpv-chapterskip = {
     pname = "mpv-chapterskip";
     version = "b26825316e3329882206ae78dc903ebc4613f039";
-    src = fetchFromGitHub ({
+    src = fetchFromGitHub {
       owner = "po5";
       repo = "chapterskip";
       rev = "b26825316e3329882206ae78dc903ebc4613f039";
       fetchSubmodules = false;
       sha256 = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90=";
-    });
+    };
     date = "2022-09-08";
   };
   mpv-createchapter = {
     pname = "mpv-createchapter";
     version = "8dd33e2debbcb963a195ec1371e02c85b49e7faa";
-    src = fetchFromGitHub ({
+    src = fetchFromGitHub {
       owner = "shinchiro";
       repo = "mpv-createchapter";
       rev = "8dd33e2debbcb963a195ec1371e02c85b49e7faa";
       fetchSubmodules = false;
       sha256 = "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=";
-    });
+    };
     date = "2020-09-05";
   };
   mpv-mpris = {
     pname = "mpv-mpris";
     version = "1.0";
-    src = fetchFromGitHub ({
+    src = fetchFromGitHub {
       owner = "hoyon";
       repo = "mpv-mpris";
       rev = "1.0";
       fetchSubmodules = false;
       sha256 = "sha256-7kPpCfiWe58V4fBOsEVvGoGeNIlMUAyD1fqS5/8k/e4=";
-    });
+    };
   };
   mpv-reload = {
     pname = "mpv-reload";
     version = "c1219b6ac3ee3de887e6a36ae41a8e478835ae92";
-    src = fetchFromGitHub ({
+    src = fetchFromGitHub {
       owner = "4e6";
       repo = "mpv-reload";
       rev = "c1219b6ac3ee3de887e6a36ae41a8e478835ae92";
       fetchSubmodules = false;
       sha256 = "sha256-+DoKPIulQA3VSeXo8DjoxnPwDfcuCO5YHpXmB+M7EWk=";
-    });
+    };
     date = "2022-01-27";
   };
   mpv-subselect = {
     pname = "mpv-subselect";
-    version = "5d2fb7ab73fc0e36d44109e75c9be26bd42084e2";
+    version = "a23111e181b0051854cc543a31bee4f6741183ac";
     src = fetchgit {
       url = "https://github.com/CogentRedTester/mpv-sub-select";
-      rev = "5d2fb7ab73fc0e36d44109e75c9be26bd42084e2";
+      rev = "a23111e181b0051854cc543a31bee4f6741183ac";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
-      sha256 = "sha256-8TZhrB9wjmytxA29fuCUGKZYPxsMYj8zDUjuuP0U0Dc=";
+      sha256 = "sha256-dwg8Trp6EqiNHrKVn//4V1jEwzZdwt5uFsHSyBOebGI=";
     };
-    date = "2023-02-22";
+    date = "2023-04-23";
   };
   mpv-youtube-quality = {
     pname = "mpv-youtube-quality";
@@ -155,10 +143,10 @@
   };
   postfix-mta-sts-resolver = {
     pname = "postfix-mta-sts-resolver";
-    version = "1.3.0";
+    version = "1.4.0";
     src = fetchTarball {
-      url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.3.0.tar.gz";
-      sha256 = "0zfgadfvyfyby6ny3kllkyvpfgvhlyik7h82lr62z6l4s6g6fdcm";
+      url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.4.0.tar.gz";
+      sha256 = "18p3n1p55qchf32khldcffzrcbz4lbz67ylrx2a6hxwpy97mp462";
     };
   };
   postfwd = {
@@ -166,15 +154,15 @@
     version = "2.03";
     src = fetchTarball {
       url = "https://github.com/postfwd/postfwd/archive/refs/tags/v2.03.tar.gz";
-      sha256 = "0js9lxzzc65plh9zdrgysxdnh11gazwwq6d8qyllq945nkxb99x6";
+      sha256 = "sha256-pqe0+rSFJEypx6gZzPlXLwRoW9f+5fYTpLcY9n+nSUs=";
     };
   };
   prometheus-lvm-exporter = {
     pname = "prometheus-lvm-exporter";
-    version = "0.3.2";
+    version = "0.3.3";
     src = fetchTarball {
-      url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.2.tar.gz";
-      sha256 = "0j6dd707wgcv18ma4i7yhv0rmj7agm8xcvx71dxxh2zg5yrfzlyh";
+      url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.3.tar.gz";
+      sha256 = "sha256-mA84Bnq5JF0BGfqHhcCzTef5nDotLgQuiyg3/zOPqTE=";
     };
   };
   psql-versioning = {
@@ -195,31 +183,31 @@
     version = "2.2.0";
     src = fetchTarball {
       url = "https://github.com/matusnovak/prometheus-smartctl/archive/refs/tags/v2.2.0.tar.gz";
-      sha256 = "0a07q0asdjck96yipdp0l8v59yc3rfsywkchxgff7hjvlfn540qv";
+      sha256 = "sha256-GwNSrKNbwuPc65BN7rXLg/lUNqLgthu9SZPJphXAByg=";
     };
   };
   v4l2loopback = {
     pname = "v4l2loopback";
-    version = "fb410fc7af40e972058809a191fae9517b9313af";
-    src = fetchFromGitHub ({
+    version = "9ba7e294ea6f45410a15f192381d4918e8df4f02";
+    src = fetchFromGitHub {
       owner = "umlaeute";
       repo = "v4l2loopback";
-      rev = "fb410fc7af40e972058809a191fae9517b9313af";
+      rev = "9ba7e294ea6f45410a15f192381d4918e8df4f02";
       fetchSubmodules = true;
-      sha256 = "sha256-0WbxavX/NzHlb0AKZDVjie1KNqGpLC9tTE/j4av+ePc=";
-    });
-    date = "2023-02-19";
+      sha256 = "sha256-rt5EfbwVpwDuMJgFxNefutSj+i9rf7TiZGUCOap9hrI=";
+    };
+    date = "2023-05-14";
   };
   xcompose = {
     pname = "xcompose";
     version = "cd8d3e622f547ec9f83d7f64f51d4a27ee812681";
-    src = fetchFromGitHub ({
+    src = fetchFromGitHub {
       owner = "kragen";
       repo = "xcompose";
       rev = "cd8d3e622f547ec9f83d7f64f51d4a27ee812681";
       fetchSubmodules = false;
       sha256 = "sha256-fkl2lDv/DdrqPjVsEUKSRD3BNGwTjTsA0ovI8akFI6U=";
-    });
+    };
     date = "2022-09-14";
   };
 }
diff --git a/flake.lock b/flake.lock
index 112d0c4a..83b63e63 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,16 +32,16 @@
         "pre-commit-hooks-nix": "pre-commit-hooks-nix_2"
       },
       "locked": {
-        "lastModified": 1681061268,
-        "narHash": "sha256-Da3NnXe1qYD7lmlsKyEeq/Z1TahmBc8VRtALu96v04A=",
+        "lastModified": 1691340067,
+        "narHash": "sha256-diC5x6yhZ02LtgjFySpwAbGpjLJi/PXjocCDs/w+XiU=",
         "owner": "gkleen",
         "repo": "ca",
-        "rev": "6cd1e33a06da36fcba37cd8c4d6a7eed0f7673bd",
+        "rev": "080e45af700bbd917a49124becd5fe5f275bfc9f",
         "type": "gitlab"
       },
       "original": {
         "owner": "gkleen",
-        "ref": "v2.0.4",
+        "ref": "v2.1.0",
         "repo": "ca",
         "type": "gitlab"
       }
@@ -59,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1674127017,
-        "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
+        "lastModified": 1686747123,
+        "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
+        "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
         "type": "github"
       },
       "original": {
@@ -161,11 +161,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1680392223,
-        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+        "lastModified": 1690933134,
+        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "flake-registry": {
       "flake": false,
       "locked": {
-        "lastModified": 1681032461,
-        "narHash": "sha256-3xrrC7YpoajVynlvj0+iQev6PWJRjS213ulTi3HNLeo=",
+        "lastModified": 1689333397,
+        "narHash": "sha256-g1Nn0sgH/hR/gEAQ1q6bloU+Q+V+Y4HlBBH6CBxC0HM=",
         "owner": "NixOS",
         "repo": "flake-registry",
-        "rev": "4ea5076e347dda44283714b8f4d580f6922064e9",
+        "rev": "5d8dc3eb692809ffd9a2f22cdb8015aa11972905",
         "type": "github"
       },
       "original": {
@@ -224,12 +224,15 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -240,14 +243,14 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1681037374,
-        "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -342,17 +345,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": [
-          "flake-utils"
         ]
       },
       "locked": {
-        "lastModified": 1681064595,
-        "narHash": "sha256-sJun76kYK+9rygz6b3g2SakRyyZ48pMUM2sVLWp/aKY=",
+        "lastModified": 1691525080,
+        "narHash": "sha256-LIqEZK2zjbk+KHUHPjNZVd+ArW2U4WvFFbVDaP0645Q=",
         "owner": "gkleen",
         "repo": "home-manager",
-        "rev": "684724ee53e2170ea41a541e9b9cf4799518bbad",
+        "rev": "cc1f628da95876bad981eb712a1102b4f50b946b",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1679224439,
-        "narHash": "sha256-QkvcuC4b67FUkkxlMsLTMPbwoD7yZr0UvJpu6jkFuLo=",
+        "lastModified": 1691292840,
+        "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "2f5e6e915d70c04d673a8930f94591595c73eb84",
+        "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4",
         "type": "github"
       },
       "original": {
@@ -420,11 +420,11 @@
     "nixpkgs-lib_2": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1680213900,
-        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
+        "lastModified": 1690881714,
+        "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
+        "rev": "9e1960bc196baf6881340d53dccb203a951745a2",
         "type": "github"
       },
       "original": {
@@ -471,38 +471,22 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1678872516,
-        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+        "lastModified": 1685566663,
+        "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+        "rev": "4ecab3273592f27479a583fb6d975d4aba3486fe",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1669833724,
-        "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_4": {
-      "locked": {
         "lastModified": 1678872516,
         "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
         "owner": "NixOS",
@@ -519,27 +503,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1678898370,
-        "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
+        "lastModified": 1691524895,
+        "narHash": "sha256-K4IUlfXJtq4r9eoYT4qtkaFWnyI8iFQcyJm6RnOHbCM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac718d02867a84b42522a0ece52d841188208f2c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1681064623,
-        "narHash": "sha256-UngFykv8KTrjxFeu4ZMvsOwFrxsa0A3ZPwyLhxb0Rrs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "da0b0bc6a5d699a8a9ffbf9e1b19e8642307062a",
+        "rev": "1c62806f8992fd548b4e2331051c8eed85bc769d",
         "type": "github"
       },
       "original": {
@@ -549,7 +517,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1681303793,
         "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
@@ -578,11 +546,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1672979485,
-        "narHash": "sha256-LrY0K1yya3nvRlGDc98wm68ozVj7E6a1EXXEr7eHp8E=",
+        "lastModified": 1687440270,
+        "narHash": "sha256-aOAXvfVn+MBSkU+xlQEiyoGpRaF6NvQdpWIhw5OH/Dc=",
         "owner": "berberman",
         "repo": "nvfetcher",
-        "rev": "0a9ac5fd07b52467d81163b1f8c94c12e5c9aff9",
+        "rev": "44196458acc2c28c32e456c50277d6148e71e708",
         "type": "github"
       },
       "original": {
@@ -619,15 +587,21 @@
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
         "gitignore": "gitignore_2",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs": [
+          "ca-util",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "ca-util",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1680981441,
-        "narHash": "sha256-Tqr2mCVssUVp1ZXXMpgYs9+ZonaWrZGPGltJz94FYi4=",
+        "lastModified": 1691256628,
+        "narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "2144d9ddcb550d6dce64a2b44facdc8c5ea2e28a",
+        "rev": "3139c4d1f7732cab89f06492bdd4677b877e3785",
         "type": "github"
       },
       "original": {
@@ -641,8 +615,8 @@
         "flake-compat": "flake-compat_4",
         "flake-utils": "flake-utils_4",
         "gitignore": "gitignore_3",
-        "nixpkgs": "nixpkgs_4",
-        "nixpkgs-stable": "nixpkgs-stable_4"
+        "nixpkgs": "nixpkgs_3",
+        "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
         "lastModified": 1685361114,
@@ -691,8 +665,8 @@
         "flake-utils": "flake-utils_3",
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-stable": "nixpkgs-stable_3",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-stable": "nixpkgs-stable_2",
         "nvfetcher": "nvfetcher",
         "prometheus-borg-exporter": "prometheus-borg-exporter",
         "sops-nix": "sops-nix"
@@ -708,11 +682,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681008913,
-        "narHash": "sha256-6C4BknF+cwCnl/A2fFdlAnc3LMV7f7XqOL09UhLZ9tA=",
+        "lastModified": 1690199016,
+        "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ddc6f124cb9be22d2ba066064c28bc19039a6bce",
+        "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500",
         "type": "github"
       },
       "original": {
@@ -736,6 +710,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 746c9134..942404e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "22.11";
+      ref = "23.05";
     };
     home-manager = {
       type = "github";
@@ -33,7 +33,6 @@
       ref = "nixos-late-start";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        utils.follows = "flake-utils";
       };
     };
     sops-nix = {
@@ -101,7 +100,7 @@
       type = "gitlab";
       owner = "gkleen";
       repo = "ca";
-      ref = "v2.0.4";
+      ref = "v2.1.0";
       inputs = {
         nixpkgs.follows = "nixpkgs";
       };
diff --git a/overlays/etesync-dav/000-fix-setup-py.patch b/overlays/etesync-dav/000-fix-setup-py.patch
deleted file mode 100644
index 00107feb..00000000
--- a/overlays/etesync-dav/000-fix-setup-py.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a69cd1a..77c7fc5 100644
---- a/setup.py
-+++ b/setup.py
-@@ -115,7 +115,7 @@ INSTALL_REQUIRES = [
-     'Flask>=1.1.1',
-     'Flask-WTF>=0.14.2,<1.0.0',
-     'requests[socks]>=2.21',
--    'types-setuptools>=50.0.0'
-+    'types-setuptools>=50.0.0',
-     'pyobjc-framework-Cocoa>=7.0.0 ; sys_platform=="darwin"',
- ]
- 
diff --git a/overlays/etesync-dav/default.nix b/overlays/etesync-dav/default.nix
deleted file mode 100644
index 963c34e2..00000000
--- a/overlays/etesync-dav/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ final, prev, ... }: {
-  etesync-dav = prev.etesync-dav.overrideAttrs (oldAttrs: rec {
-    version = "0.32.1";
-    src = prev.fetchFromGitHub {
-      owner = "etesync";
-      repo = "etesync-dav";
-      rev = "108c23abf0f036522af38411bced50c4f6c0a731";
-      hash = "sha256-w0EuU+E9B2fp5/WfI/KJ8i1AuV4JHWNdZ8o6aopqrfs=";
-    };
-    patches = (oldAttrs.patches or []) ++ [ ./000-fix-setup-py.patch ];
-    propagatedBuildInputs = (oldAttrs.propagatedBuildInputs or []) ++ [
-      prev.python3.pkgs.types-setuptools
-    ];
-  });
-}