From 3c26121de1bb2a577e4a8e3693c0e43e7b814adc Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 4 Mar 2024 21:50:56 -0500 Subject: [PATCH] Fixup flake.nix syntax --- flake.nix | 60 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index b52adf0..c841401 100644 --- a/flake.nix +++ b/flake.nix @@ -47,14 +47,22 @@ # creates a macOS system config darwinHostConfig = system: hostname: username: nix-darwin.lib.darwinSystem { - pkgs = import nixpkgs { - inherit system; - config = { - allowUnfree = true; - permittedInsecurePackages = [ "python-2.7.18.7" ]; + specialArgs = { inherit inputs username hostname; + pkgs = import nixpkgs { + inherit system; + config = { + 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 = [ nix-homebrew.darwinModules.nix-homebrew { nix-homebrew = { @@ -83,14 +91,22 @@ # creates a nixos system config nixosHostConfig = system: hostname: username: nixpkgs.lib.nixosSystem { - pkgs = import nixpkgs { - inherit system; - config = { - allowUnfree = true; - permittedInsecurePackages = [ "electron-21.4.4" ]; + specialArgs = { inherit inputs username hostname; + pkgs = import nixpkgs { + inherit system; + config = { + 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 = [ disko.nixosModules.disko @@ -114,14 +130,22 @@ }; # end nixosSystem linuxHomeConfig = system: hostname: username: home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { - inherit system; - config = { - allowUnfree = true; - permittedInsecurePackages = [ "electron-21.4.4" ]; + extraSpecialArgs = { inherit genebean-omp-themes hostname username; + pkgs = import nixpkgs { + inherit system; + config = { + 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/home-manager/hosts/${hostname}/${username}.nix {