diff --git a/common.nix b/common.nix index 4b3c54b..1d452cd 100644 --- a/common.nix +++ b/common.nix @@ -1,6 +1,6 @@ rec { default = { - browser = "io.github.zen_browser.zen"; + browser = "zen"; calculator = "gnome-calculator"; fileManager = "nautilus"; imageViewer = "loupe"; diff --git a/configuration.nix b/configuration.nix index 00ec6b2..2c090b3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,5 +1,6 @@ { pkgs, + inputs, outputs, ... }: @@ -45,13 +46,13 @@ in protonmail-desktop stremio fastfetch - freetube discord nix-prefetch-github # Cmd to get rev and hash from GitHub gimp vlc fortune cowsay + inputs.zen-browser.packages."${system}".default # beta ]; nix.settings.experimental-features = [ diff --git a/flake.lock b/flake.lock index 5989e68..03fb676 100644 --- a/flake.lock +++ b/flake.lock @@ -726,6 +726,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -809,7 +825,8 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "spicetify-nix": "spicetify-nix", - "stylix": "stylix" + "stylix": "stylix", + "zen-browser": "zen-browser" } }, "spicetify-nix": { @@ -983,6 +1000,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1736655632, + "narHash": "sha256-TeA6G+BUWhOi2ZnewAEfwbsY/ku1H1sdNKfwjvH0wzM=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "32f3692cc4d6a1d1cb8943be7d2e712a63c4b374", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d2bb9bf..9135dbe 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ url = "github:danth/stylix/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; }; outputs = diff --git a/home-manager/default-applications.nix b/home-manager/default-applications.nix index 0f51ecd..01de62a 100644 --- a/home-manager/default-applications.nix +++ b/home-manager/default-applications.nix @@ -4,7 +4,7 @@ enable = true; defaultApplications = let - browser = "io.github.zen_browser.zen.desktop"; + browser = "zen.desktop"; imageViewer = "org.gnome.Loupe.desktop"; in { diff --git a/home-manager/default.nix b/home-manager/default.nix index 128eb5d..d81c245 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -16,6 +16,7 @@ in ./default-applications.nix ./development ./fish.nix + ./freetube.nix ./gtk.nix ./mpv.nix ./nextcloud.nix diff --git a/home-manager/freetube.nix b/home-manager/freetube.nix new file mode 100644 index 0000000..cc63fae --- /dev/null +++ b/home-manager/freetube.nix @@ -0,0 +1,49 @@ +{ + catppuccin.freetube.enable = true; + + programs.freetube = { + enable = true; + settings = { + allowDashAv1Formats = true; + checkForUpdates = false; + currentLocale = "en-GB"; + defaultTheatreMode = true; + defaultQuality = "1080"; + region = "NO"; + useSponsorBlock = true; + + sponsorBlockSponsor = { + color = "CatppuccinMochaGreen"; + skip = "autoSkip"; + }; + sponsorBlockSelfPromo = { + color = "CatppuccinMochaYellow"; + skip = "showInSeekBar"; + }; + sponsorBlockInteraction = { + color = "CatppuccinMochaPink"; + skip = "showInSeekBar"; + }; + sponsorBlockIntro = { + color = "CatppuccinMochaSapphire"; + skip = "doNothing"; + }; + sponsorBlockOutro = { + color = "CatppuccinMochaBlue"; + skip = "doNothing"; + }; + sponsorBlockRecap = { + color = "CatppuccinMochaMauve"; + skip = "doNothing"; + }; + sponsorBlockMusicOffTopic = { + color = "CatppuccinMochaFlamingo"; + skip = "doNothing"; + }; + sponsorBlockFiller = { + color = "CatppuccinMochaMauve"; + skip = "doNothing"; + }; + }; + }; +}