Skip to content

Commit

Permalink
fix(freetube): force upgrade to v0.21.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Wittano committed Jul 27, 2024
1 parent 24fac53 commit 183d77a
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 13 deletions.
24 changes: 20 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions lib/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, system, inputs, pkgs, unstable, privateRepo, ... }:
{ lib, system, inputs, pkgs, unstable, privateRepo, master, ... }:
with lib;
let
dotfilesPath = ./../dotfiles;
Expand All @@ -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 ./.)
4 changes: 2 additions & 2 deletions lib/desktop.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, lib, unstable, secretDir, ... }:
{ pkgs, lib, unstable, secretDir, master, ... }:
with lib;
with lib.my;
let
Expand Down Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions lib/hosts.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
};

Expand Down
9 changes: 7 additions & 2 deletions modules/desktop/submodules/general.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, lib, unstable, ... }:
{ pkgs, lib, unstable, master, ... }:
with lib;
with lib.my;
let
Expand All @@ -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 = [
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 183d77a

Please sign in to comment.