diff --git a/flake.lock b/flake.lock index 0ccea9e..fa928a9 100644 --- a/flake.lock +++ b/flake.lock @@ -132,6 +132,23 @@ "type": "github" } }, + "firefox-gx-src": { + "flake": false, + "locked": { + "lastModified": 1708376786, + "narHash": "sha256-xECzIpSr923mlUc5Pk/y0d2BrXVECow2NaL4p79i+/U=", + "owner": "Godiesc", + "repo": "firefox-gx", + "rev": "fd5d51fc9986e854093ff162237281d2fd067e53", + "type": "github" + }, + "original": { + "owner": "Godiesc", + "ref": "v.9.0", + "repo": "firefox-gx", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1688025799, @@ -1284,6 +1301,7 @@ "coc-stylelintplus": "coc-stylelintplus", "curseforge-server-downloader-src": "curseforge-server-downloader-src", "eisa-scripts-src": "eisa-scripts-src", + "firefox-gx-src": "firefox-gx-src", "git-theme-src": "git-theme-src", "gpu-screen-recorder-src": "gpu-screen-recorder-src", "gtk-theme-src": "gtk-theme-src", @@ -1342,11 +1360,11 @@ "sops-nix": "sops-nix" }, "locked": { - "lastModified": 1708666849, - "narHash": "sha256-+NhnK9Hu9x4cd0g7Basyl3C5leuV0deKHsLBwGB+Yl8=", + "lastModified": 1708798000, + "narHash": "sha256-UPQaG6sF5O9bLKba09gG7IokXeVbQk5R4SbvKJzha98=", "ref": "refs/heads/main", - "rev": "cd38fa99b54c6a359610cfc246b4464b5df34dff", - "revCount": 43, + "rev": "0e7607e1ae9b536eb5ad7f87d42abbb267d38b7e", + "revCount": 45, "type": "git", "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets" }, diff --git a/flake.nix b/flake.nix index 7a2b142..0292f78 100644 --- a/flake.nix +++ b/flake.nix @@ -340,14 +340,7 @@ flake = false; }; - ## Dracula src - nvim-theme-src = { - type = "github"; - owner = "Mofiqul"; - repo = "dracula.nvim"; - flake = false; - }; - + ## Dracula and theme src bat-theme-src = { type = "github"; owner = "matt1432"; @@ -355,6 +348,14 @@ flake = false; }; + firefox-gx-src = { + type = "github"; + owner = "Godiesc"; + repo = "firefox-gx"; + ref = "v.9.0"; + flake = false; + }; + git-theme-src = { type = "github"; owner = "dracula"; @@ -369,6 +370,13 @@ flake = false; }; + nvim-theme-src = { + type = "github"; + owner = "Mofiqul"; + repo = "dracula.nvim"; + flake = false; + }; + plymouth-theme-src = { type = "github"; owner = "matt1432"; diff --git a/home/firefox/default.nix b/home/firefox/default.nix index d47ffd1..76ffcdb 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -1,13 +1,16 @@ { config, pkgs, + firefox-gx-src, ... }: let inherit (builtins) readFile; firefox-addons = pkgs.recurseIntoAttrs (pkgs.callPackage ./addons {}); sound-volume = firefox-addons."600-sound-volume"; - firefox-gx = pkgs.callPackage ./firefox-gx {}; + firefox-gx = pkgs.callPackage ./firefox-gx { + inherit firefox-gx-src; + }; in { home.file = { ".mozilla/firefox/matt/chrome/components".source = "${firefox-gx}/chrome/components"; diff --git a/home/firefox/firefox-gx/default.nix b/home/firefox/firefox-gx/default.nix index 7acf886..47c5618 100644 --- a/home/firefox/firefox-gx/default.nix +++ b/home/firefox/firefox-gx/default.nix @@ -1,18 +1,13 @@ { lib, stdenvNoCC, - fetchFromGitHub, + firefox-gx-src, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "firefox-gx"; - version = "9.0"; + version = firefox-gx-src.rev; - src = fetchFromGitHub { - owner = "Godiesc"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FCx5mADqrjAN27lLaZViOFGUNDg/2jpern8sem8u49w="; - }; + src = firefox-gx-src; installPhase = '' # Personal changes