From 183d77a6e0ca66f79ff829d9acd8aca9879ce497 Mon Sep 17 00:00:00 2001
From: Wittano Bonarotti <radoslaw.ratyna@gmail.com>
Date: Sat, 27 Jul 2024 20:13:20 +0200
Subject: [PATCH] fix(freetube): force upgrade to v0.21.2

---
 flake.lock                             | 24 ++++++++++++++++++++----
 flake.nix                              |  4 +++-
 lib/default.nix                        |  4 ++--
 lib/desktop.nix                        |  4 ++--
 lib/hosts.nix                          |  4 ++--
 modules/desktop/submodules/general.nix |  9 +++++++--
 6 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 78c5c9a0..4fc65e24 100644
--- a/flake.lock
+++ b/flake.lock
@@ -399,6 +399,21 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1722102829,
+        "narHash": "sha256-U8IKw1m4/QKrQf6TFse5TQQUPQ3ERmi2nq8Dg8C+wnM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3d3c0f4d34f218e1a30f280dfa635cfe4e8111b1",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "master",
+        "type": "indirect"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1721924956,
@@ -494,8 +509,8 @@
     "nixpkgs_7": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=",
-        "path": "/nix/store/114462g9fhfa5ck1ssribfdh7wlk9m1s-source",
+        "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
+        "path": "/nix/store/19l2iplgd8kw8b1il0sl8wv9cv725w4f-source",
         "type": "path"
       },
       "original": {
@@ -520,8 +535,8 @@
     "nixpkgs_9": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=",
-        "path": "/nix/store/114462g9fhfa5ck1ssribfdh7wlk9m1s-source",
+        "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
+        "path": "/nix/store/19l2iplgd8kw8b1il0sl8wv9cv725w4f-source",
         "type": "path"
       },
       "original": {
@@ -563,6 +578,7 @@
         "home-manager": "home-manager",
         "honkai-railway-grub-theme": "honkai-railway-grub-theme",
         "nixpkgs": "nixpkgs_4",
+        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "xmonad-contrib": "xmonad-contrib"
diff --git a/flake.nix b/flake.nix
index 2ddfedf3..61d9fb85 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,7 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-master.url = "nixpkgs/master";
     home-manager.url = "github:nix-community/home-manager/release-24.05";
     filebot.url = "github:Wittano/filebot";
     aagl = {
@@ -49,12 +50,13 @@
 
       pkgs = mkPkgs inputs.nixpkgs;
       unstable = mkPkgs inputs.nixpkgs-unstable;
+      master = mkPkgs inputs.nixpkgs-master;
 
       privateRepo = lib.my.pkgs.importPkgs ./pkgs;
 
       lib = nixpkgs.lib.extend (sefl: super: {
         hm = home-manager.lib.hm;
-        my = import ./lib { inherit lib system inputs pkgs unstable privateRepo; };
+        my = import ./lib { inherit lib system inputs pkgs unstable privateRepo master; };
       });
     in
     {
diff --git a/lib/default.nix b/lib/default.nix
index c92a4b1a..a39aa656 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-{ lib, system, inputs, pkgs, unstable, privateRepo, ... }:
+{ lib, system, inputs, pkgs, unstable, privateRepo, master, ... }:
 with lib;
 let
   dotfilesPath = ./../dotfiles;
@@ -7,6 +7,6 @@ in
 attrsets.mapAttrs'
   (n: v: {
     name = strings.removeSuffix ".nix" n;
-    value = import (./. + "/${n}") { inherit lib pkgs dotfilesPath privateRepo unstable inputs system secretDir; };
+    value = import (./. + "/${n}") { inherit lib pkgs dotfilesPath privateRepo unstable inputs system secretDir master; };
   })
   (builtins.readDir ./.)
diff --git a/lib/desktop.nix b/lib/desktop.nix
index 57f967e8..d71ef433 100644
--- a/lib/desktop.nix
+++ b/lib/desktop.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, unstable, secretDir, ... }:
+{ pkgs, lib, unstable, secretDir, master, ... }:
 with lib;
 with lib.my;
 let
@@ -30,7 +30,7 @@ let
     '';
 
   mkDesktopApp = config: dotfiles: name: desktopName: import (./../modules/desktop/submodules + "/${name}.nix") {
-    inherit pkgs dotfiles config unstable lib desktopName secretDir;
+    inherit pkgs dotfiles config unstable lib desktopName secretDir master;
   };
 in
 {
diff --git a/lib/hosts.nix b/lib/hosts.nix
index e23f8313..59efe4d8 100644
--- a/lib/hosts.nix
+++ b/lib/hosts.nix
@@ -1,4 +1,4 @@
-{ lib, system, pkgs, unstable, privateRepo, inputs, dotfilesPath, secretDir, ... }:
+{ lib, system, pkgs, unstable, privateRepo, inputs, dotfilesPath, secretDir, master, ... }:
 with lib;
 with lib.my;
 let
@@ -39,7 +39,7 @@ in
       inherit system;
 
       specialArgs = {
-        inherit pkgs unstable lib dotfiles isDevMode inputs privateRepo system hostname desktopName secretDir;
+        inherit pkgs unstable lib dotfiles isDevMode inputs privateRepo system hostname desktopName secretDir master;
         templateDir = ./../templates;
       };
 
diff --git a/modules/desktop/submodules/general.nix b/modules/desktop/submodules/general.nix
index bb0258b1..bc3671ee 100644
--- a/modules/desktop/submodules/general.nix
+++ b/modules/desktop/submodules/general.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, unstable, ... }:
+{ pkgs, lib, unstable, master, ... }:
 with lib;
 with lib.my;
 let
@@ -8,6 +8,11 @@ let
       --replace "$out/bin/${oldAttrs.pname}" "$out/bin/${oldAttrs.pname} --use-tray-icon"
     '';
   });
+  # workaround to skip wating for put freetube's update into unstable branch
+  fixedFreetube =
+    if unstable.freetube.version == "0.21.1"
+    then master.freetube
+    else unstable.freetube;
 in
 {
   autostart = [
@@ -51,7 +56,7 @@ in
 
         # Apps
         spotify
-        unstable.freetube # Youtube desktop
+        fixedFreetube # Youtube desktop
         unstable.joplin-desktop # Notebook
         unstable.vscodium # VS code
         minder # Mind maps