updates and fixes

only throws problem and spotify apparently changed some policies

flake.lock

@@ -12,11 +12,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1703433843,
+        "lastModified": 1707830867,
-        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707683400,
+        "lastModified": 1708031129,
-        "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
+        "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,
+        "lastModified": 1707825078,
-        "narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=",
+        "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,
+        "lastModified": 1707956935,
-        "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
+        "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
+        "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -94,7 +94,6 @@
               home-manager.users.rouven = {
                 imports = [
                   nix-colors.homeManagerModules.default
-                  agenix.homeManagerModules.default
                 ];
               };
             }

hosts/falkenstein/modules/mail/default.nix

@@ -34,6 +34,7 @@ in
       enable = true;
       enableSubmission = true;
       enableSubmissions = true;
+      recipientDelimiter = "+";
       hostname = "${hostname}";
       domain = "${domain}";
       origin = "${domain}";

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 { };

secrets.nix

@@ -30,7 +30,4 @@ in
   "secrets/falkenstein/wireguard/dorm/preshared.age".publicKeys = [ rouven falkenstein ];
   "secrets/falkenstein/borg/passphrase.age".publicKeys = [ rouven falkenstein ];
   "secrets/falkenstein/borg/key.age".publicKeys = [ rouven falkenstein ];
-
-  # rouven (home manager)
-  "secrets/rouven/spotify.age".publicKeys = [ rouven ];
 }

secrets/rouven/spotify.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 uWbAHQ klzqpl+5gMc23pxP7b6WeMnz0GupktMWsozSgu5qjVI
-zLIUb95/je/M2yGilR2PA5JyO4pG98qSeSa9cBN8oi0
--> vi>dm(?-grease nUG 4q;
-eFlRMpjidL3vhoL3XhkOfqrdNAV7vBqgsPS5k9NWME2cqK4CcdHNLcyOdQipB2oh
-sMK94/EdKhLC+insD3oR+q6369vB/3oaBayNSUM
---- De9rDCy3TGRbiGWLSanEwhheglOK8uOHa8Ioga1UjvY
-•9+ð¯Ãæ€pG®“ÑMèi$
±ˆ“;ÊuÆ,DãëE°ÌÚȸ²®¤±Ë

users/rouven/modules/default.nix

@@ -9,7 +9,6 @@
     ./mpv
     # broken
     # ./qutebrowser
-    ./spotify
     ./ssh
     ./theme
     ./tex

users/rouven/modules/git/default.nix

@@ -4,21 +4,31 @@
     enable = true;
     userName = "Rouven Seifert";
     userEmail = "rouven@rfive.de";
-    extraConfig = {
+    delta = {
-      core.pager = "${pkgs.delta}/bin/delta";
+      enable = true;
-      interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+      options = {
-      delta = {
+        features = "decorations";
         navigate = true;
         light = false;
         side-by-side = true;
         line-numbers = true;
       };
+    };
+    extraConfig = {
       merge.conflictStyle = "diff3";
       diff.colorMoved = "default";
       user.signingkey = "B95E8FE6B11C4D09";
       pull.rebase = false;
       init.defaultBranch = "main";
       commit.gpgsign = true;
+      sendemail = {
+        from = "Rouven Seifert <rouven@rfive.de>";
+        smtpEncryption = "ssl";
+        smtpServer = "mail.rfive.de";
+        smteServerPort = 465;
+        smtpSslCertPath = "/etc/ssl/certs/ca-certificates.crt";
+        smtpUser = "rouven";
+      };
     };
   };
   programs.gh = {

users/rouven/modules/spotify/default.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = with pkgs;[ spotify-tui ];
-  age.secrets.spotify = {
-    file = ../../../../secrets/rouven/spotify.age;
-  };
-  services.spotifyd = {
-    enable = true;
-    settings = {
-      global = {
-        username = "seifertrouven@gmail.com";
-        password_cmd = "${pkgs.coreutils}/bin/cat ${config.age.secrets.spotify.path}";
-      };
-      backend = "pulseaudio";
-    };
-  };
-  systemd.user.services.spotifyd.Unit.After = [ "agenix.service" ];
-}