mirror of
https://github.com/srid/nixos-config.git
synced 2026-01-09 01:47:23 +08:00
Fix darwin activation
It must also work using local flake.nix, not the direnv activated flake!
This commit is contained in:
parent
9331190086
commit
fb40a057fb
2 changed files with 5 additions and 4 deletions
|
|
@ -43,13 +43,13 @@
|
|||
inputs.flake-parts.lib.mkFlake { inherit (inputs) self; } {
|
||||
systems = [ "x86_64-linux" "aarch64-darwin" ];
|
||||
imports = [
|
||||
inputs.flake-root.flakeModule
|
||||
inputs.mission-control.flakeModule
|
||||
./lib.nix
|
||||
./users
|
||||
./home
|
||||
./nixos
|
||||
./nix-darwin
|
||||
inputs.mission-control.flakeModule
|
||||
inputs.flake-root.flakeModule
|
||||
];
|
||||
|
||||
flake = {
|
||||
|
|
|
|||
5
lib.nix
5
lib.nix
|
|
@ -55,7 +55,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
perSystem = { system, pkgs, lib, ... }: {
|
||||
perSystem = { system, config, pkgs, lib, ... }: {
|
||||
mission-control.scripts = {
|
||||
update-primary = {
|
||||
description = ''
|
||||
|
|
@ -76,8 +76,9 @@
|
|||
# TODO: Replace with deploy-rs or (new) nixinate
|
||||
if system == "aarch64-darwin" then
|
||||
''
|
||||
cd "$(${lib.getExe config.flake-root.package})"
|
||||
${self.darwinConfigurations.default.system}/sw/bin/darwin-rebuild \
|
||||
switch --flake ${self}#default
|
||||
switch --flake .#default
|
||||
''
|
||||
else
|
||||
''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue