added env and used env in config for more robust builds
This commit is contained in:
4
.env.example
Normal file
4
.env.example
Normal 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
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
.env
|
||||||
@@ -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
|
||||||
|
|||||||
@@ -8,8 +8,12 @@
|
|||||||
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
|
||||||
|
primaryUser = builtins.getEnv "SYSTEM_PRIMARY_USER";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
darwinConfigurations.primaryUser = nix-darwin.lib.darwinSystem {
|
||||||
modules = [
|
modules = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
nix-homebrew.darwinModules.nix-homebrew
|
nix-homebrew.darwinModules.nix-homebrew
|
||||||
|
|||||||
Reference in New Issue
Block a user