Stop redefining nixpkgs on NixOS

This commit is contained in:
Gene Liverman 2024-12-04 06:54:47 -05:00
parent ba91e6b0ca
commit 087a6fe757

View file

@ -119,17 +119,20 @@
# creates a nixos system config # creates a nixos system config
nixosHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nixpkgs.lib.nixosSystem { nixosHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs compose2nix hostname username;
pkgs = import nixpkgs {
inherit system; inherit system;
specialArgs = { inherit inputs compose2nix hostname username; } // additionalSpecialArgs;
modules = [
# move this to a common file later
({
nixpkgs = {
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ "olm-3.2.16" "electron-27.3.11" ]; permittedInsecurePackages = [ "olm-3.2.16" "electron-27.3.11" ];
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ nixpkgs-terraform.overlays.default ];
}; };
} // additionalSpecialArgs; })
modules = [
disko.nixosModules.disko disko.nixosModules.disko
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {