From 3dc025762fb3f7af589d6617944cd48161babad9 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sat, 17 Feb 2024 19:14:03 +0100
Subject: [PATCH] updates and fixes

---
 flake.lock                                 | 24 +++++++++++-----------
 hosts/falkenstein/modules/mail/default.nix |  1 +
 overlays/default.nix                       | 18 +---------------
 users/rouven/modules/default.nix           |  1 -
 4 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index a605e4c..bb58035 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1703433843,
-        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
+        "lastModified": 1707830867,
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707683400,
-        "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
+        "lastModified": 1708031129,
+        "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
+        "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
         "type": "github"
       },
       "original": {
@@ -261,11 +261,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1706637303,
-        "narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=",
+        "lastModified": 1707825078,
+        "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
         "owner": "Misterio77",
         "repo": "nix-colors",
-        "rev": "fc080c51d2a219b40d886870e364243783ed5ca1",
+        "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707546158,
-        "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
+        "lastModified": 1707956935,
+        "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
+        "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
         "type": "github"
       },
       "original": {
diff --git a/hosts/falkenstein/modules/mail/default.nix b/hosts/falkenstein/modules/mail/default.nix
index dcbcb4e..c19faa5 100644
--- a/hosts/falkenstein/modules/mail/default.nix
+++ b/hosts/falkenstein/modules/mail/default.nix
@@ -34,6 +34,7 @@ in
       enable = true;
       enableSubmission = true;
       enableSubmissions = true;
+      recipientDelimiter = "+";
       hostname = "${hostname}";
       domain = "${domain}";
       origin = "${domain}";
diff --git a/overlays/default.nix b/overlays/default.nix
index 08f4b42..8cda764 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -5,6 +5,7 @@ let
   inherit (prev) fetchPypi;
   inherit (prev) fetchpatch;
   inherit (prev) makeWrapper;
+  inherit (prev) python3Packages;
 in
 rec {
   pcmanfm = prev.pcmanfm.overrideAttrs (_: {
@@ -17,23 +18,6 @@ rec {
   pww = callPackage ../pkgs/pww { };
   ianny = callPackage ../pkgs/ianny { };
 
-  python3 = prev.python3.override {
-    packageOverrides = _finel: prev: {
-      tpm2-pytss = prev.tpm2-pytss.overrideAttrs (old: {
-        # https://github.com/NixOS/nixpkgs/pull/287804/
-        patches = old.patches ++ [
-          (fetchpatch {
-            name = "fix-newer-cryptography-42-0-1-support.patch";
-            url = "https://github.com/tpm2-software/tpm2-pytss/commit/0fbb9d099370c0a7031dd13990986538f586836a.patch";
-            sha256 = "sha256-xnQIr4/iJra0+rn5estVqSvG8pXcuwWykmmayBpCzgw=";
-          })
-
-        ];
-      });
-    };
-
-  };
-  python3Packages = python3.pkgs;
   tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
 
   gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix
index d913806..8fdb02e 100644
--- a/users/rouven/modules/default.nix
+++ b/users/rouven/modules/default.nix
@@ -9,7 +9,6 @@
     ./mpv
     # broken
     # ./qutebrowser
-    ./spotify
     ./ssh
     ./theme
     ./tex