refactor(firefox-gx): fetch src from flake inputs
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-02-26 14:38:51 -05:00
parent 5287b37f45
commit 261bc1f180
4 changed files with 46 additions and 22 deletions

View file

@ -132,6 +132,23 @@
"type": "github" "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": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1688025799, "lastModified": 1688025799,
@ -1284,6 +1301,7 @@
"coc-stylelintplus": "coc-stylelintplus", "coc-stylelintplus": "coc-stylelintplus",
"curseforge-server-downloader-src": "curseforge-server-downloader-src", "curseforge-server-downloader-src": "curseforge-server-downloader-src",
"eisa-scripts-src": "eisa-scripts-src", "eisa-scripts-src": "eisa-scripts-src",
"firefox-gx-src": "firefox-gx-src",
"git-theme-src": "git-theme-src", "git-theme-src": "git-theme-src",
"gpu-screen-recorder-src": "gpu-screen-recorder-src", "gpu-screen-recorder-src": "gpu-screen-recorder-src",
"gtk-theme-src": "gtk-theme-src", "gtk-theme-src": "gtk-theme-src",
@ -1342,11 +1360,11 @@
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
}, },
"locked": { "locked": {
"lastModified": 1708666849, "lastModified": 1708798000,
"narHash": "sha256-+NhnK9Hu9x4cd0g7Basyl3C5leuV0deKHsLBwGB+Yl8=", "narHash": "sha256-UPQaG6sF5O9bLKba09gG7IokXeVbQk5R4SbvKJzha98=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "cd38fa99b54c6a359610cfc246b4464b5df34dff", "rev": "0e7607e1ae9b536eb5ad7f87d42abbb267d38b7e",
"revCount": 43, "revCount": 45,
"type": "git", "type": "git",
"url": "ssh://git@git.nelim.org/matt1432/nixos-secrets" "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
}, },

View file

@ -340,14 +340,7 @@
flake = false; flake = false;
}; };
## Dracula src ## Dracula and theme src
nvim-theme-src = {
type = "github";
owner = "Mofiqul";
repo = "dracula.nvim";
flake = false;
};
bat-theme-src = { bat-theme-src = {
type = "github"; type = "github";
owner = "matt1432"; owner = "matt1432";
@ -355,6 +348,14 @@
flake = false; flake = false;
}; };
firefox-gx-src = {
type = "github";
owner = "Godiesc";
repo = "firefox-gx";
ref = "v.9.0";
flake = false;
};
git-theme-src = { git-theme-src = {
type = "github"; type = "github";
owner = "dracula"; owner = "dracula";
@ -369,6 +370,13 @@
flake = false; flake = false;
}; };
nvim-theme-src = {
type = "github";
owner = "Mofiqul";
repo = "dracula.nvim";
flake = false;
};
plymouth-theme-src = { plymouth-theme-src = {
type = "github"; type = "github";
owner = "matt1432"; owner = "matt1432";

View file

@ -1,13 +1,16 @@
{ {
config, config,
pkgs, pkgs,
firefox-gx-src,
... ...
}: let }: let
inherit (builtins) readFile; inherit (builtins) readFile;
firefox-addons = pkgs.recurseIntoAttrs (pkgs.callPackage ./addons {}); firefox-addons = pkgs.recurseIntoAttrs (pkgs.callPackage ./addons {});
sound-volume = firefox-addons."600-sound-volume"; sound-volume = firefox-addons."600-sound-volume";
firefox-gx = pkgs.callPackage ./firefox-gx {}; firefox-gx = pkgs.callPackage ./firefox-gx {
inherit firefox-gx-src;
};
in { in {
home.file = { home.file = {
".mozilla/firefox/matt/chrome/components".source = "${firefox-gx}/chrome/components"; ".mozilla/firefox/matt/chrome/components".source = "${firefox-gx}/chrome/components";

View file

@ -1,18 +1,13 @@
{ {
lib, lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, firefox-gx-src,
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation {
pname = "firefox-gx"; pname = "firefox-gx";
version = "9.0"; version = firefox-gx-src.rev;
src = fetchFromGitHub { src = firefox-gx-src;
owner = "Godiesc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FCx5mADqrjAN27lLaZViOFGUNDg/2jpern8sem8u49w=";
};
installPhase = '' installPhase = ''
# Personal changes # Personal changes