From df7d9f91d484f1388b8929cd033b06d961ee8c3c Mon Sep 17 00:00:00 2001 From: sefidel Date: Mon, 1 Apr 2024 17:24:03 +0900 Subject: fix(nixos/kanata): use invidious overlay --- flake.lock | 17 +++++++++++++++++ flake.nix | 2 ++ nixos/default.nix | 9 ++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 894c45a..805413d 100644 --- a/flake.lock +++ b/flake.lock @@ -689,6 +689,22 @@ "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", @@ -868,6 +884,7 @@ "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 42920e4..8987f06 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,8 @@ 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 c9b4c72..d20458d 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,4 +1,4 @@ -{ self, unstable, ... } @ inputs: +{ self, unstable, nixpkgs-invidious, ... } @ inputs: { alpha = self.lib.mkSystem { @@ -29,5 +29,12 @@ inputs.impermanence.nixosModules.impermanence inputs.attic.nixosModules.atticd ]; + overlays = [ + (final: prev: { + # TODO: https://github.com/NixOS/nixpkgs/pull/300643 + inherit (nixpkgs-invidious.legacyPackages.x86_64-linux) + invidious; + }) + ]; }; } -- cgit 1.4.1