Derivations/TidalDL: Update to v0.31.3

derivations/tidal-dl-ng/default.nix

@@ -6,82 +6,95 @@
   pkgs,
 }: let
   #
-  # Dependencies
+  # Custom Dependencies
   #
-  requests_2_32_4 = pkgs.python3Packages.requests.overridePythonAttrs (old: {
+  pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
-    version = "2.32.4";
+    typer = super.typer.overridePythonAttrs (old: {
-    src = pkgs.python3Packages.fetchPypi {
+      version = "0.20.0";
-      inherit (old) pname;
+      src = super.fetchPypi {
-      version = "2.32.4";
+        inherit (old) pname;
-      sha256 = "sha256-J9AxZoLIopg00yZIIAJLYqNpQgg9Usry8UwFkTNtNCI=";
+        version = "0.20.0";
-    };
+        sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
-    patches =
+      };
-      builtins.filter (
+    });
-        p: !pkgs.lib.strings.hasInfix "CVE-2024-47081" (toString p)
+
-      )
+    rich = super.rich.overridePythonAttrs (old: {
-      old.patches;
+      version = "14.2.0";
+      src = super.fetchPypi {
+        inherit (old) pname;
+        version = "14.2.0";
+        sha256 = "sha256-c/9Qx8DBx3yCQweSg/Tts3bw9kQkM67LjOfm0LktH+Q=";
+      };
+      doCheck = false;
+    });
   });
 
-  pycryptodome_3_23_0 = pkgs.python3Packages.pycryptodome.overridePythonAttrs (old: {
+  # typer_0_20_0 = pkgs.python313Packages.typer.overridePythonAttrs (old: {
-    version = "3.23.0";
+  #   version = "0.20.0";
-    src = pkgs.python3Packages.fetchPypi {
+  #   src = pkgs.python313Packages.fetchPypi {
-      inherit (old) pname;
+  #     inherit (old) pname;
-      version = "3.23.0";
+  #     version = "0.20.0";
-      sha256 = "sha256-RHcAplcYLWAzi6sJ/bJ1GPiFauzYCuTGvd22f/XaRO8=";
+  #     sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
-    };
+  #   };
-  });
+  # });
+  #
+  # rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
+  #   version = "14.2.0";
+  #   src = pkgs.python313Packages.fetchPypi {
+  #     inherit (old) pname;
+  #     version = "14.2.0";
+  #     sha256 = "sha256-c/9Qx8DBx3yCQweSg/Tts3bw9kQkM67LjOfm0LktH+Q=";
+  #   };
+  #   doCheck = false;
+  # });
 
-  pathvalidate_3_3_1 = pkgs.python3Packages.pathvalidate.overridePythonAttrs (old: {
+  # rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
-    version = "3.3.1";
+  #   version = "14.2.0";
-    src = pkgs.python3Packages.fetchPypi {
+  #   src = pkgs.fetchFromGitHub {
-      inherit (old) pname;
+  #     owner = "Textualize";
-      version = "3.3.1";
+  #     repo = "rich";
-      sha256 = "sha256-sYwHISv+rWJDRbuOHWFBzc8Vo5c2mU6guUA1rSsboXc=";
+  #     tag = "v14.2.0";
-    };
+  #     hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=";
-  });
+  #   };
+  # });
 
-  typer_0_16_0 = pkgs.python3Packages.typer.overridePythonAttrs (old: {
+  tidalDlNg = pythonPkgs.buildPythonApplication rec {
-    version = "0.16.0";
-    src = pkgs.python3Packages.fetchPypi {
-      inherit (old) pname;
-      version = "0.16.0";
-      sha256 = "sha256-rzd/+u4dvjeulEDLTo8RaG6lzk6brgG4SufGO4fx3Ts=";
-    };
-  });
-
-  tidalDlNg = pkgs.python3Packages.buildPythonApplication rec {
     pname = "tidal-dl-ng";
-    version = "0.26.2";
+    version = "0.31.3";
     format = "pyproject";
 
     src = pkgs.fetchFromGitHub {
       owner = "exislow";
       repo = "tidal-dl-ng";
       rev = "v${version}";
-      sha256 = "sha256-9C7IpLKeR08/nMbePltwGrzIgXfdaVfyOeFQnfCwMKg=";
+      sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
     };
 
     doCheck = false;
     catchConflicts = false;
 
-    nativeBuildInputs = with pkgs.python3Packages; [poetry-core setuptools];
+    nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
 
-    propagatedBuildInputs = with pkgs.python3Packages; [
+    # https://github.com/exislow/tidal-dl-ng/blob/master/pyproject.toml
-      requests_2_32_4
+    propagatedBuildInputs = with pythonPkgs; [
-      coloredlogs
+      # Nixpkgs
-      dataclasses-json
+      requests
-      m3u8
-      mpegdash
       mutagen
-      pathvalidate_3_3_1
+      dataclasses-json
-      pycryptodome_3_23_0
+      pathvalidate
-      python-ffmpeg
+      m3u8
-      rich
+      coloredlogs
-      tidalapi
-      toml
-      typer_0_16_0
       pyside6
       pyqtdarktheme
+      toml
+      pycryptodome
+      tidalapi
+      python-ffmpeg
+      ansi2html
+
+      # Custom Deps
+      typer
+      rich
     ];
 
     # pythonOutputDistPhase = ''
@@ -118,7 +131,7 @@
 
   tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
     pname = "tdng";
-    version = "0.26.2";
+    version = "0.31.3";
     dontUnpack = true;
 
     nativeBuildInputs = [pkgs.makeWrapper];

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755946532,
+        "lastModified": 1761420899,
-        "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=",
+        "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada",
+        "rev": "62479232aae42c1ef09c2c027c8cfd91df060897",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1731098351,
+        "lastModified": 1754269165,
-        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
+        "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
+        "rev": "444e81206df3f7d92780680e45858e31d2f07a08",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1747046372,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
     },
     "flake-compat_3": {
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1761588595,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
+        "lastModified": 1754091436,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1760948891,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1758663926,
+        "lastModified": 1762336257,
-        "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=",
+        "narHash": "sha256-2u5rstcMTqpAr4UF+exs5WGOT62VJRb4yauR6JJHJXs=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1",
+        "rev": "d48e8f0e1691e0200a675c13df7c85e275090a15",
         "type": "github"
       },
       "original": {
@@ -333,11 +333,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758928860,
+        "lastModified": 1762351818,
-        "narHash": "sha256-ZqaRdd+KoR54dNJPtd7UX4O0X+02YItnTpQVu28lSVI=",
+        "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bc2afee55bc5d3b825287829d6592b9cc1405aad",
+        "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756718721,
+        "lastModified": 1761258142,
-        "narHash": "sha256-2JQ/KxMEVDjauaFU62T0udjKXKSiCyKO5frjVf4b4A8=",
+        "narHash": "sha256-ZaiEZnsm7LlpDL/C/D4vO5QHgv9GdFrO9Fd2qlyvVRc=",
         "owner": "VirtCode",
         "repo": "hypr-dynamic-cursors",
-        "rev": "0e11ed12dbd4d0c62b362dda2559c2e374814d56",
+        "rev": "7336d7a7cf81422d0d8a574e9e9ba6fe8eab8dfc",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758192433,
+        "lastModified": 1760445448,
-        "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=",
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
         "type": "github"
       },
       "original": {
@@ -445,11 +445,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1758927862,
+        "lastModified": 1762269308,
-        "narHash": "sha256-I724P6Mud+VSPiyvwu2If10AaKER1RKiKI633C9FnyQ=",
+        "narHash": "sha256-3fTMnF1E7BsZ7NlmFmPo6+SRFm4FELP45IDLHcGLZ1s=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "6f1d2e771dca1b5eea5ec344ca1b6a80d4fd4ee5",
+        "rev": "46b71eda6423cc9c3b19cb310c3344e81ac624c5",
         "type": "github"
       },
       "original": {
@@ -473,11 +473,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758895089,
+        "lastModified": 1762115485,
-        "narHash": "sha256-HOIITlSwB5iuVEVLmWNGu8bvI83Y2IbN8SzJQmBDwvg=",
+        "narHash": "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "4d940a10aff16b240533c9b6527a14ff91e5e5ae",
+        "rev": "bbb8d2cb0eb667f2911103eadb3d1e8176f4462c",
         "type": "github"
       },
       "original": {
@@ -498,11 +498,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749046714,
+        "lastModified": 1759610243,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
         "type": "github"
       },
       "original": {
@@ -566,11 +566,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757694755,
+        "lastModified": 1759080228,
-        "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=",
+        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
         "owner": "hyprwm",
         "repo": "hyprland-qtutils",
-        "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c",
+        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
         "type": "github"
       },
       "original": {
@@ -595,11 +595,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756810301,
+        "lastModified": 1758927902,
-        "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=",
+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931",
+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1754887838,
+        "lastModified": 1759033501,
-        "narHash": "sha256-npC+H+Wl60EdrV75sjqm+bbbLbKgCCGn4ALSM0B2OWA=",
+        "narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=",
         "owner": "KZDKM",
         "repo": "Hyprspace",
-        "rev": "2b61fd2115262243b03aa9afe8dfd8a78e71636c",
+        "rev": "e54884da1d6a1af76af9d053887bf3750dd554fd",
         "type": "github"
       },
       "original": {
@@ -641,11 +641,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756117388,
+        "lastModified": 1762208756,
-        "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
+        "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
+        "rev": "164a30b3d8b3174a32ac7326782476f1188e6118",
         "type": "github"
       },
       "original": {
@@ -734,16 +734,16 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1737639419,
+        "lastModified": 1762205063,
-        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
+        "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
+        "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "v0.4.2",
+        "ref": "v0.4.3",
         "repo": "lanzaboote",
         "type": "github"
       }
@@ -773,11 +773,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1757920634,
+        "lastModified": 1762007860,
-        "narHash": "sha256-MNxTc+dncIHFGKQRyAqI/Clttp3JICaSUKlMUQ6l9jc=",
+        "narHash": "sha256-wDaM4D0Fqt0nCoFbZsi3mtAkIzzsbGdmuj+356KHEvU=",
         "owner": "thiagokokada",
         "repo": "nix-alien",
-        "rev": "f8a51ef800bc8b7420998415035f9c086eb64d5c",
+        "rev": "2c770275b2fb78c813a52a4d52ba2d27789d8ec3",
         "type": "github"
       },
       "original": {
@@ -810,11 +810,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757822619,
+        "lastModified": 1761451000,
-        "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=",
+        "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea",
+        "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4",
         "type": "github"
       },
       "original": {
@@ -841,27 +841,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1730741070,
+        "lastModified": 1762233356,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
+        "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1758791193,
-        "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01",
+        "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
         "type": "github"
       },
       "original": {
@@ -873,11 +857,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1757745802,
+        "lastModified": 1761907660,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
         "type": "github"
       },
       "original": {
@@ -889,11 +873,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1758690382,
+        "lastModified": 1762111121,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
         "type": "github"
       },
       "original": {
@@ -926,11 +910,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1758931855,
+        "lastModified": 1762293638,
-        "narHash": "sha256-jTmbWlOxsy9dDP3UdCB6jEO63FtkM3dQG2FOq0b4foI=",
+        "narHash": "sha256-svsYLbxNq8EZoVtNF97wCAElZ2py5Q1p7viG6lTUixA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "e0f1e4ae4bb8762b7c51c3a514ca19664fad9c3b",
+        "rev": "aa3a1dfb028cd09b8061862f9dd8d859467fc7ed",
         "type": "github"
       },
       "original": {
@@ -970,11 +954,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758967756,
+        "lastModified": 1762353374,
-        "narHash": "sha256-6bQ4DC5oKXhZVCwwde98VzYfMBTtJ7jUb3wnaFN7zos=",
+        "narHash": "sha256-1RsLS/+Cx4ZW0uZ3JylcQ79vFOhqVGstcI5CK873M0A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e39e2b15a41cb527c8b68baf946e98a37a806847",
+        "rev": "88c5ab984a8f2ccd0a88ac905c3bd1db0140f48d",
         "type": "github"
       },
       "original": {
@@ -993,11 +977,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758662783,
+        "lastModified": 1761730856,
-        "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
         "type": "github"
       },
       "original": {
@@ -1016,11 +1000,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1760663237,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -1039,15 +1023,14 @@
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
-        ],
+        ]
-        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731363552,
+        "lastModified": 1750779888,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
         "type": "github"
       },
       "original": {
@@ -1071,7 +1054,7 @@
         "nix-alien": "nix-alien",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-stable": "nixpkgs-stable_2",
+        "nixpkgs-stable": "nixpkgs-stable",
         "nixvim": "nixvim",
         "nps": "nps",
         "nur": "nur",
@@ -1087,11 +1070,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731897198,
+        "lastModified": 1761791894,
-        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
+        "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
+        "rev": "59c45eb69d9222a4362673141e00ff77842cd219",
         "type": "github"
       },
       "original": {
@@ -1107,11 +1090,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758425756,
+        "lastModified": 1760998189,
-        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
         "type": "github"
       },
       "original": {
@@ -1188,11 +1171,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755269745,
+        "lastModified": 1759844618,
-        "narHash": "sha256-TMAEI9FR4YxMxyu+TG77ucDvIYm8NOP+ZTYRzeAisJw=",
+        "narHash": "sha256-wGoP8VHBKn2QNaQpyeOn6bx+thccMT5TgWxxeefzxj4=",
         "owner": "adriankarlen",
         "repo": "textfox",
-        "rev": "a2a6d607e31edb318c296fe72302489d3a6b040c",
+        "rev": "d5bfe864c50b17ea62750458e83877a5256aca5b",
         "type": "github"
       },
       "original": {
@@ -1229,11 +1212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755354946,
+        "lastModified": 1761431178,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -32,7 +32,7 @@
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     # Secure boot
-    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
+    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.3";
     lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
 
     # Nix User Repository (e.g. Firefox addons)

home/christoph/default.nix

@@ -291,7 +291,7 @@
 
           # Hardware/Software info
           pciutils # lspci
-          glxinfo # OpenGL info
+          mesa-demos # OpenGL info
           wayland-utils # wayland-info
           clinfo # OpenCL info
           vulkan-tools # vulkaninfo
@@ -312,7 +312,7 @@
           spotdl
 
           # Document utils
-          poppler_utils # pdfunite
+          poppler-utils # pdfunite
           graphviz # generate graphs from code
           d2 # generate diagrams from code
           plantuml # generate diagrams
@@ -334,8 +334,6 @@
           cifs-utils # Mount samba shares
           nfs-utils # Mount NFS shares
           sshfs # Mount remote directories via SSH
-          protonvpn-cli_2
-          protonmail-bridge # TODO: Enable on startup, email module
 
           # Run unpatched binaries on NixOS
           # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
@@ -808,21 +806,22 @@
 
   systemd = {
     user = {
-      tmpfiles.rules = lib.mkMerge [
+      # TODO: This has been deprecated and replaced with a bad alternative in a stupid HM update
-        []
+      # tmpfiles.rules = lib.mkMerge [
-        (lib.mkIf (mylib.modules.contains
+      #   []
-          config.services.flatpak.packages
+      #   (lib.mkIf (mylib.modules.contains
-          "com.discordapp.Discord") [
+      #     config.services.flatpak.packages
-          # Fix Discord rich presence for Flatpak
+      #     "com.discordapp.Discord") [
-          "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
+      #     # Fix Discord rich presence for Flatpak
-        ])
+      #     "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
-        (lib.mkIf (mylib.modules.contains
+      #   ])
-          config.services.flatpak.packages
+      #   (lib.mkIf (mylib.modules.contains
-          "com.discordapp.DiscordCanary") [
+      #     config.services.flatpak.packages
-          # Fix Discord rich presence for Flatpak
+      #     "com.discordapp.DiscordCanary") [
-          "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
+      #     # Fix Discord rich presence for Flatpak
-        ])
+      #     "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
-      ];
+      #   ])
+      # ];
 
       # Nicely reload system units when changing configs
       startServices = "sd-switch";

home/modules/1_deprecated/flatpak/default.nix

@@ -81,7 +81,7 @@ with mylib.modules;
             cp -f ${pkgs.lxgw-wenkai}/share/fonts/truetype/LXGWWenKaiMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
             cp -f ${pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
             cp -f ${pkgs.noto-fonts}/share/fonts/noto/NotoSans[wdth,wght].ttf ${config.home.homeDirectory}/.local/share/fonts/
-            cp -f ${pkgs.noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf ${config.home.homeDirectory}/.local/share/fonts/
+            cp -f ${pkgs.noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf ${config.home.homeDirectory}/.local/share/fonts/
           '';
         })
         (mkElse cfg.fontFix {

home/modules/1_deprecated/ranger/default.nix

@@ -33,7 +33,7 @@ in {
           python310Packages.pillow
           ffmpegthumbnailer
           imagemagick
-          poppler_utils
+          poppler-utils
         ])
       ];
 

home/modules/git/default.nix

@@ -11,30 +11,29 @@ in {
   options.modules.git = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf git.enable {
-    programs.git = {
+    programs.diff-so-fancy = {
       enable = true;
+      enableGitIntegration = true;
 
-      # userEmail = "christoph.urlacher@protonmail.com";
+      settings = {
-      # userName = "Christoph Urlacher";
-
-      userEmail = git.userEmail;
-      userName = git.userName;
-
-      signing = {
-        signByDefault = git.signCommits;
-        format = "ssh";
-        key = "~/.ssh/id_ed25519.pub";
-      };
-
-      lfs.enable = true;
-      diff-so-fancy = {
-        enable = true;
         changeHunkIndicators = true;
         markEmptyLines = false;
         stripLeadingSymbols = true;
       };
+    };
+
+    programs.git = {
+      enable = true;
+
+      # settings.user.email = "christoph.urlacher@protonmail.com";
+      # settings.user.name = "Christoph Urlacher";
+
+      settings = {
+        user = {
+          email = git.userEmail;
+          name = git.userName;
+        };
 
-      extraConfig = {
         core = {
           compression = 9;
           # whitespace = "error";
@@ -111,6 +110,14 @@ in {
           };
         };
       };
+
+      signing = {
+        signByDefault = git.signCommits;
+        format = "ssh";
+        key = "~/.ssh/id_ed25519.pub";
+      };
+
+      lfs.enable = true;
     };
   };
 }

home/modules/hyprland/default.nix

@@ -61,7 +61,7 @@ in {
         wl-clipboard
         clipman # Clipboard manager (wl-paste)
         libnotify
-        inotifyTools # Includes inotifywait
+        inotify-tools # Includes inotifywait
 
         ncpamixer # Audio control
         slurp # Region selector for screensharing

home/modules/neovim/default.nix

@@ -820,6 +820,8 @@ in {
           };
 
           # NOTE: This entire thing is rough, I should rewrite...
+          # TODO: Need to rewrite this once lspconfig 3.0 comes around
+          # TODO: LSP servers don't autostart anymore...
           lspconfig = {
             name = "lspconfig";
             pkg = pkgs.vimPlugins.nvim-lspconfig;
@@ -837,14 +839,17 @@ in {
                   extraOptions = {
                     root_dir.__raw = ''
                       function(fname)
-                        return require("lspconfig.util").root_pattern(
+                        -- return require("lspconfig.util").root_pattern(
+                        return vim.lsp.config.util.root_pattern(
                           "Makefile",
                           "CMakeLists.txt",
                           ".clang-format",
                           ".clang-tidy"
-                        )(fname) or require("lspconfig.util").root_pattern(
+                        -- )(fname) or require("lspconfig.util").root_pattern(
+                        )(fname) or vim.lsp.config.util.root_pattern(
                           "compile_commands.json"
-                        )(fname) or require("lspconfig.util").find_git_ancestor(fname)
+                        -- )(fname) or require("lspconfig.util").find_git_ancestor(fname)
+                        )(fname) or vim.lsp.config.util.find_git_ancestor(fname)
                       end
                     '';
 
@@ -941,9 +946,6 @@ in {
               ];
             in ''
               function(_, opts)
-                -- Make LspInfo window border rounded
-                require("lspconfig.ui.windows").default_options.border = "rounded"
-
                 local __lspOnAttach = function(client, bufnr)
 
                   -- NOTE: The ltex-extra package needs to be loaded in ltex's onAttach.
@@ -987,7 +989,8 @@ in {
 
                 for i, server in ipairs(${servers}) do
                   if type(server) == "string" then
-                    require("lspconfig")[server].setup(__setup)
+                    -- require("lspconfig")[server].setup(__setup)
+                    vim.lsp.config(server, __setup)
                   else
                     local options = server.extraOptions
 
@@ -997,7 +1000,8 @@ in {
                       options = vim.tbl_extend("keep", options, __setup)
                     end
 
-                    require("lspconfig")[server.name].setup(options)
+                    -- require("lspconfig")[server.name].setup(options)
+                    vim.lsp.config(server.name, options)
                   end
                 end
               end

home/modules/neovim/mappings.nix

@@ -834,19 +834,19 @@ _: let
     {
       mode = "n";
       key = "<leader>tt";
-      action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>";
+      action = "<cmd>Trouble diagnostics toggle focus=false win.position=left<cr>";
       options.desc = "Trouble Diagnostics";
     }
     {
       mode = "n";
       key = "<leader>tD";
-      action = "<cmd>Trouble todo toggle focus=false win.position=bottom<cr>";
+      action = "<cmd>Trouble todo toggle focus=false win.position=left<cr>";
       options.desc = "Toggle TODOs";
     }
     {
       mode = "n";
       key = "<leader>ts";
-      action = "<cmd>Trouble symbols toggle focus=false win.position=right<cr>";
+      action = "<cmd>Trouble symbols toggle focus=false win.position=left<cr>";
       options.desc = "Trouble Symbols";
     }
     {

home/modules/neovim/vim_opts.nix

@@ -10,6 +10,7 @@ _: {
   formatexpr = "v:lua.require('conform').formatexpr()";
   laststatus = 3; # Global statusline
   winblend = 30; # Floating popup transparency
+  winborder = "rounded";
   sessionoptions = ["buffers" "curdir" "folds" "globals" "help" "skiprtp" "tabpages" "winsize"]; # What should be saved when creating a session
   showtabline = 2; # Disable tabline with 0, show for > 1 with 1, always show with 2
   conceallevel = 2;

system/modules/fonts/default.nix

@@ -29,7 +29,7 @@ in {
 
         # Sans/Serif fonts
         noto-fonts
-        noto-fonts-emoji
+        noto-fonts-color-emoji
         noto-fonts-cjk-sans
         lxgw-wenkai
       ];

system/nixinator/hardware-configuration.nix

@@ -131,7 +131,7 @@
 
       # https://nixos.wiki/wiki/Accelerated_Video_Playback
       extraPackages = with pkgs; [
-        vaapiVdpau # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
+        libva-vdpau-driver # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
         libvdpau-va-gl # Taken from wiki
 
         # https://discourse.nixos.org/t/nvidia-open-breaks-hardware-acceleration/58770/3

system/nixtop/hardware-configuration.nix

@@ -71,8 +71,8 @@
       # driSupport = true; # NOTE: Deprecated
       extraPackages = with pkgs; [
         intel-media-driver
-        vaapiIntel
+        intel-vaapi-driver
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
       ];
     };

system/servenix/hardware-configuration.nix

@@ -92,7 +92,7 @@
       enable32Bit = true;
 
       extraPackages = with pkgs; [
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
 
         nvidia-vaapi-driver