diff --git a/home/firefox/default.nix b/home/firefox/default.nix index 1f352199..d47ffd1b 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -41,8 +41,6 @@ in { # Prefs "layout.css.devPixelsPerPx" = 1.12; - "browser.tabs.firefox-view" = false; - "browser.tabs.firefox-view-next" = false; "browser.search.widget.inNavBar" = true; "browser.toolbars.bookmarks.visibility" = "always"; "browser.toolbars.bookmarks.showInPrivateBrowsing" = true; diff --git a/home/firefox/firefox-gx/default.nix b/home/firefox/firefox-gx/default.nix index a6cc30da..7acf8860 100644 --- a/home/firefox/firefox-gx/default.nix +++ b/home/firefox/firefox-gx/default.nix @@ -2,35 +2,33 @@ lib, stdenvNoCC, fetchFromGitHub, -}: let +}: +stdenvNoCC.mkDerivation rec { pname = "firefox-gx"; - version = "c1d9888d27543ded51f9854d7e58db601fd33d43"; -in - stdenvNoCC.mkDerivation { - inherit pname version; + version = "9.0"; - src = fetchFromGitHub { - owner = "Godiesc"; - repo = pname; - rev = "${version}"; - sha256 = "sha256-FCx5mADqrjAN27lLaZViOFGUNDg/2jpern8sem8u49w="; - }; + src = fetchFromGitHub { + owner = "Godiesc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FCx5mADqrjAN27lLaZViOFGUNDg/2jpern8sem8u49w="; + }; - installPhase = '' - # Personal changes - sed -i 's/var(--fuchsia))/var(--purple))/' ./chrome/components/ogx_root-personal.css + installPhase = '' + # Personal changes + sed -i 's/var(--fuchsia))/var(--purple))/' ./chrome/components/ogx_root-personal.css - # Fix new tab background for nix - substituteInPlace ./chrome/components/ogx_root-personal.css \ - --replace '../newtab/wallpaper-dark.png' "$out/chrome/newtab/private-dark.png" + # Fix new tab background for nix + substituteInPlace ./chrome/components/ogx_root-personal.css \ + --replace-fail '../newtab/wallpaper-dark.png' "$out/chrome/newtab/private-dark.png" - mkdir -p $out - cp -r ./* $out - ''; + mkdir -p $out + cp -r ./* $out + ''; - meta = with lib; { - description = "Firefox Theme CSS to Opera GX Lovers"; - homepage = "https://github.com/Godiesc/firefox-gx"; - license = licenses.mspl; - }; - } + meta = with lib; { + description = "Firefox Theme CSS to Opera GX Lovers"; + homepage = "https://github.com/Godiesc/firefox-gx"; + license = licenses.mspl; + }; +}