atau
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thelio76: move ff addons to overlay instead of special arg

This commit is contained in:
Alex 2024-08-01 18:37:21 -04:00
parent e91134aec1
commit 260b59c751
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/apps/firefox.nix
View File

@ -1,4 +1,4 @@
{ pkgs, firefox-addons, ... }: { pkgs, ... }:
{ {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
@ -26,7 +26,7 @@
"browser.urlbar.suggest.quicksuggest.sponsored" = false; "browser.urlbar.suggest.quicksuggest.sponsored" = false;
"extensions.autoDisableScopes" = 0; "extensions.autoDisableScopes" = 0;
}; };
extensions = with firefox-addons; [ extensions = with pkgs.firefox-addons; [
darkreader darkreader
multi-account-containers multi-account-containers
simple-tab-groups simple-tab-groups

6
config/modules/home-manager.nix
View File

@ -1,14 +1,14 @@
{ system, inputs, user, ... }: { system, home-manager, user, ... }:
{ {
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.users.${user} = import ../users/${user}; 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
View File

@ -26,14 +26,21 @@
pcUser = "alex"; pcUser = "alex";
pcSystem = "x86_64-linux"; 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. # 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 { mkPcSystem = { user ? pcUser, hostname, system ? pcSystem, inputs ? flake-inputs }: nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
({ config, pkgs, ... }: { nixpkgs.overlays = [ atau-nixpkgs.overlays.default ]; }) ({ config, pkgs, ... }: { nixpkgs.overlays = overlays; })
./config/hosts/${hostname} ./config/hosts/${hostname}
] ++ (import ./config/modules/home-manager.nix { ] ++ (import ./config/modules/home-manager.nix {
inherit system inputs user; inherit system home-manager user;
}).modules; }).modules;
}; };
in in