added env and used env in config for more robust builds

This commit is contained in:
2026-10-20 11:51:56 -04:00
parent 863b47e663
commit 9a2a269984
4 changed files with 32 additions and 18 deletions

4
.env.example Normal file
View File

@@ -0,0 +1,4 @@
TARGET_USER=firstlast
SYSTEM_STATE_VERSION=6
SYSTEM_PRIMARY_USER=admin
SYSTEM_ARCH=aarch64-darwin

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.env

View File

@@ -1,18 +1,23 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
system = builtins.getEnv "SYSTEM_ARCH";
stateVersion = builtins.getEnv "SYSTEM_STATE_VERSION";
primaryUser = builtins.getEnv "SYSTEM_PRIMARY_USER";
in
{ {
imports = [ imports = [
./cli-tools.nix ./cli-tools.nix
]; ];
nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.hostPlatform = system;
nix.enable = false; nix.enable = false;
nix.settings.experimental-features = "nix-command flakes"; nix.settings.experimental-features = "nix-command flakes";
system.stateVersion = 6; system.stateVersion = stateVersion;
system.primaryUser = "briannelson"; system.primaryUser = primaryUser;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ffmpeg ffmpeg

View File

@@ -8,20 +8,24 @@
nix-homebrew.url = "github:zhaofengli/nix-homebrew"; nix-homebrew.url = "github:zhaofengli/nix-homebrew";
}; };
outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }: { outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }:
darwinConfigurations."briannelson" = nix-darwin.lib.darwinSystem { let
modules = [ primaryUser = builtins.getEnv "SYSTEM_PRIMARY_USER";
./configuration.nix in
nix-homebrew.darwinModules.nix-homebrew {
{ darwinConfigurations.primaryUser = nix-darwin.lib.darwinSystem {
nix-homebrew = { modules = [
enable = true; ./configuration.nix
enableRosetta = true; nix-homebrew.darwinModules.nix-homebrew
user = "briannelson"; {
autoMigrate = true; nix-homebrew = {
}; enable = true;
} enableRosetta = true;
]; user = "briannelson";
autoMigrate = true;
};
}
];
};
}; };
};
} }