From 4d876b55bfee9eb42e366f2157715167be765869 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Sat, 27 Apr 2024 10:46:52 +0900
Subject: chore(modules/invidious): move to latest version

---
 flake.lock        | 17 -----------------
 flake.nix         |  2 --
 nixos/default.nix | 15 +++++++++++----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 098be0d..4d68fcb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -689,22 +689,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-invidious": {
-      "locked": {
-        "lastModified": 1711959271,
-        "narHash": "sha256-TrNJ6tTjs2qHaZ8fEeWhE4EdAKb4U393FEkXNiqrBUU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e79cebc3bfa79f79945b3f831ae1f52bd1e52407",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e79cebc3bfa79f79945b3f831ae1f52bd1e52407",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
@@ -884,7 +868,6 @@
         "neovim-nightly": "neovim-nightly",
         "nix-gaming": "nix-gaming",
         "nixpkgs-2311": "nixpkgs-2311",
-        "nixpkgs-invidious": "nixpkgs-invidious",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "nur": "nur",
diff --git a/flake.nix b/flake.nix
index 8987f06..42920e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,8 +18,6 @@
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
     nixpkgs-wayland.inputs.nixpkgs.follows = "unstable";
 
-    nixpkgs-invidious.url = "github:NixOS/nixpkgs/e79cebc3bfa79f79945b3f831ae1f52bd1e52407";
-
     impermanence.url = "github:nix-community/impermanence";
 
     sops-nix.url = "github:Mic92/sops-nix";
diff --git a/nixos/default.nix b/nixos/default.nix
index d20458d..599ba75 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,4 +1,4 @@
-{ self, unstable, nixpkgs-invidious, ... } @ inputs:
+{ self, unstable, ... } @ inputs:
 
 {
   alpha = self.lib.mkSystem {
@@ -31,9 +31,16 @@
     ];
     overlays = [
       (final: prev: {
-        # TODO: https://github.com/NixOS/nixpkgs/pull/300643
-        inherit (nixpkgs-invidious.legacyPackages.x86_64-linux)
-          invidious;
+        # TODO: https://github.com/NixOS/nixpkgs/pull/307083
+        invidious = prev.invidious.overrideAttrs(old: {
+          src = prev.fetchFromGitHub {
+            owner = "iv-org";
+            repo = "invidious";
+            fetchSubmodules = true;
+            rev = "v2.20240427";
+            hash = "sha256-YZ+uhn1ESuRTZxAMoxKCpxEaUfeCUqOrSr3LkdbrTkU=";
+          };
+        });
       })
     ];
   };
-- 
cgit 1.4.1