Fixup flake.nix syntax

This commit is contained in:
Gene Liverman 2024-03-04 21:50:56 -05:00
parent bfde05861e
commit 3c26121de1

View file

@ -47,14 +47,22 @@
# creates a macOS system config # creates a macOS system config
darwinHostConfig = system: hostname: username: nix-darwin.lib.darwinSystem { darwinHostConfig = system: hostname: username: nix-darwin.lib.darwinSystem {
pkgs = import nixpkgs { specialArgs = { inherit inputs username hostname;
inherit system; pkgs = import nixpkgs {
config = { inherit system;
allowUnfree = true; config = {
permittedInsecurePackages = [ "python-2.7.18.7" ]; allowUnfree = true;
permittedInsecurePackages = [ "python-2.7.18.7" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "python-2.7.18.7" ];
};
}; };
}; };
specialArgs = { inherit inputs username hostname; };
modules = [ modules = [
nix-homebrew.darwinModules.nix-homebrew { nix-homebrew.darwinModules.nix-homebrew {
nix-homebrew = { nix-homebrew = {
@ -83,14 +91,22 @@
# creates a nixos system config # creates a nixos system config
nixosHostConfig = system: hostname: username: nixpkgs.lib.nixosSystem { nixosHostConfig = system: hostname: username: nixpkgs.lib.nixosSystem {
pkgs = import nixpkgs { specialArgs = { inherit inputs username hostname;
inherit system; pkgs = import nixpkgs {
config = { inherit system;
allowUnfree = true; config = {
permittedInsecurePackages = [ "electron-21.4.4" ]; allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
}; };
}; };
specialArgs = { inherit inputs username hostname; };
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko
@ -114,14 +130,22 @@
}; # end nixosSystem }; # end nixosSystem
linuxHomeConfig = system: hostname: username: home-manager.lib.homeManagerConfiguration { linuxHomeConfig = system: hostname: username: home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { extraSpecialArgs = { inherit genebean-omp-themes hostname username;
inherit system; pkgs = import nixpkgs {
config = { inherit system;
allowUnfree = true; config = {
permittedInsecurePackages = [ "electron-21.4.4" ]; allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
}; };
}; };
extraSpecialArgs = { inherit genebean-omp-themes hostname username; };
modules = [ modules = [
./modules/home-manager/hosts/${hostname}/${username}.nix ./modules/home-manager/hosts/${hostname}/${username}.nix
{ {