...flakes

7 files changed, 69 insertions, 20 deletions

diff --git a/_sources/generated.json b/_sources/generated.json
index b5f06da0..9e22b48e 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -505,11 +505,38 @@
         "passthru": null,
         "pinned": false,
         "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
             "name": null,
-            "sha256": "sha256-t3PIG7a3HLLBEc+4WfRTx6cc8u9E7/I0/xVYdxhMPk8=",
-            "type": "url",
-            "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.12.8.tar.gz"
+            "owner": "yt-dlp",
+            "repo": "yt-dlp",
+            "rev": "2025.12.08",
+            "sha256": "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "2025.12.08"
+    },
+    "yt-dlp-ejs": {
+        "cargoLock": null,
+        "date": null,
+        "extract": null,
+        "name": "yt-dlp-ejs",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "yt-dlp",
+            "repo": "ejs",
+            "rev": "0.3.2",
+            "sha256": "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg=",
+            "sparseCheckout": [],
+            "type": "github"
         },
-        "version": "2025.12.8"
+        "version": "0.3.2"
     }
 }
\ No newline at end of file
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 30fe0839..e433bce4 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -313,10 +313,24 @@
   };
   yt-dlp = {
     pname = "yt-dlp";
-    version = "2025.12.8";
-    src = fetchurl {
-      url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.12.8.tar.gz";
-      sha256 = "sha256-t3PIG7a3HLLBEc+4WfRTx6cc8u9E7/I0/xVYdxhMPk8=";
+    version = "2025.12.08";
+    src = fetchFromGitHub {
+      owner = "yt-dlp";
+      repo = "yt-dlp";
+      rev = "2025.12.08";
+      fetchSubmodules = false;
+      sha256 = "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g=";
+    };
+  };
+  yt-dlp-ejs = {
+    pname = "yt-dlp-ejs";
+    version = "0.3.2";
+    src = fetchFromGitHub {
+      owner = "yt-dlp";
+      repo = "ejs";
+      rev = "0.3.2";
+      fetchSubmodules = false;
+      sha256 = "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg=";
     };
   };
 }
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 2011e670..02241bd0 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -506,8 +506,8 @@ in {
           fira-code-symbols libreoffice xournalpp
           nixos-shell virt-viewer freerdp gnome-icon-theme
           paper-icon-theme sshpassSecret weechat element-desktop
-          sieve-connect gimp3 inkscape udiskie glab nitrokey-app
-          pynitrokey gtklock wlrctl remmina openscad spice-record
+          sieve-connect gimp3 inkscape udiskie glab
+          gtklock wlrctl remmina openscad spice-record
           nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
           swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE]))
diff --git a/flake.lock b/flake.lock
index e657ceea..cfd51277 100644
--- a/flake.lock
+++ b/flake.lock
@@ -813,11 +813,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1765186076,
-        "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
         "type": "github"
       },
       "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index f90f9249..258a83f7 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -575,7 +575,6 @@ in {
       firmware = [ pkgs.linux-firmware ];
 
       keyboard.uhk.enable = true;
-      nitrokey.enable = true;
     };
 
     # sound.enable = true;
diff --git a/nvfetcher.toml b/nvfetcher.toml
index 499a4e81..23f4c5dd 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -105,8 +105,12 @@ src.prefix = "v"
 fetch.tarball = "https://github.com/JonathonReinhart/spice-record/archive/refs/tags/v$ver.tar.gz"
 
 [yt-dlp]
-src.pypi = "yt_dlp"
-fetch.pypi = "yt_dlp"
+src.github = "yt-dlp/yt-dlp"
+fetch.github = "yt-dlp/yt-dlp"
+
+[yt-dlp-ejs]
+src.github = "yt-dlp/ejs"
+fetch.github = "yt-dlp/ejs"
 
 [netbootxyz-efi]
 src.github = "netbootxyz/netboot.xyz"
diff --git a/overlays/yt-dlp.nix b/overlays/yt-dlp.nix
index 435afd58..1c9f77d8 100644
--- a/overlays/yt-dlp.nix
+++ b/overlays/yt-dlp.nix
@@ -1,8 +1,13 @@
-{ prev, sources, ... }: {
+{ prev, final, sources, ... }: {
   yt-dlp = prev.yt-dlp.overrideAttrs (oldAttrs: {
     inherit (sources.yt-dlp) pname version src;
-
-    postPatch = "";
-    installCheckPhase = "true";
   });
+  python3 = prev.python3.override {
+    packageOverrides = python-self: python-super: {
+      yt-dlp-ejs = python-super.yt-dlp-ejs.overridePythonAttrs (oldAttrs: {
+        inherit (sources.yt-dlp-ejs) pname version src;
+      });
+    };
+  };
+  python3Packages = final.python3.pkgs;
 }