thelio76: move ff addons to overlay instead of special arg
This commit is contained in:
parent
e91134aec1
commit
260b59c751
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, firefox-addons, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
|
@ -26,7 +26,7 @@
|
|||
"browser.urlbar.suggest.quicksuggest.sponsored" = false;
|
||||
"extensions.autoDisableScopes" = 0;
|
||||
};
|
||||
extensions = with firefox-addons; [
|
||||
extensions = with pkgs.firefox-addons; [
|
||||
darkreader
|
||||
multi-account-containers
|
||||
simple-tab-groups
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ system, inputs, user, ... }:
|
||||
{ system, home-manager, user, ... }:
|
||||
{
|
||||
modules = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.backupFileExtension = "backup";
|
||||
home-manager.users.${user} = import ../users/${user};
|
||||
|
||||
home-manager.extraSpecialArgs = { inherit user; firefox-addons = inputs.firefox-addons.packages.${system}; };
|
||||
home-manager.extraSpecialArgs = { inherit user; };
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
11
flake.nix
11
flake.nix
|
@ -26,14 +26,21 @@
|
|||
pcUser = "alex";
|
||||
pcSystem = "x86_64-linux";
|
||||
|
||||
overlays = [
|
||||
atau-nixpkgs.overlays.default
|
||||
(final: prev: {
|
||||
firefox-addons = firefox-addons.packages.${system};
|
||||
})
|
||||
];
|
||||
|
||||
# This helper function generates a nixos system for a linux PC setup. It defaults the username, architecture, and flake inputs if not provided.
|
||||
mkPcSystem = { user ? pcUser, hostname, system ? pcSystem, inputs ? flake-inputs }: nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
({ config, pkgs, ... }: { nixpkgs.overlays = [ atau-nixpkgs.overlays.default ]; })
|
||||
({ config, pkgs, ... }: { nixpkgs.overlays = overlays; })
|
||||
./config/hosts/${hostname}
|
||||
] ++ (import ./config/modules/home-manager.nix {
|
||||
inherit system inputs user;
|
||||
inherit system home-manager user;
|
||||
}).modules;
|
||||
};
|
||||
in
|
||||
|
|
Loading…
Reference in New Issue