1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Commit graph

152 commits

Author SHA1 Message Date
Michael Hoang
050b7db445 installer: don't tell users to source bashrc
Fixes #380
2024-11-09 22:00:43 +11:00
Michael Hoang
3a89b61432 uninstaller: check nix-daemon was correctly reinstalled 2024-11-07 18:52:15 +11:00
Michael Hoang
ebca0c23c9 uninstaller: switch to writeShellApplication
By not defining a `shellHook`, `nix-shell -A uninstaller` and
`nix-shell -A uninstaller.check` no longer work.
2024-11-07 18:52:15 +11:00
Michael Hoang
c3b406bd1c uninstaller: restore *.before-nix-darwin files
Fixes https://github.com/LnL7/nix-darwin/issues/911
Fixes https://github.com/LnL7/nix-darwin/issues/912
2024-11-07 18:17:34 +11:00
Michael Hoang
9cd45289c9 uninstaller: reset any shells pointing to /run/current-system/sw/bin 2024-11-07 18:17:34 +11:00
Michael Hoang
1b5fa6be40 uninstaller: remove unnecessary attempt to delete nix-daemon
Fixes https://github.com/LnL7/nix-darwin/issues/910
2024-11-07 18:17:34 +11:00
Michael Hoang
84ad3a2d7e uninstaller: remove /run symlink 2024-11-07 18:17:34 +11:00
Michael Hoang
1d8c91b40e darwin-rebuild: do not resolve flake path
Backport of c274d045ac

Fixes #549
2024-11-03 12:56:25 +11:00
Michael Hoang
406cb56d06 Back out "Add support for submodules in flakes"
This backs out commit 5452c8c638.
2024-11-03 12:56:25 +11:00
Michael Hoang
fd6660cb91 tests: fix negative asserts with grep not working
Using `grep -v` without `-z` will return 0 even if there is a match
found as all the non-matching lines will be matched. Instead of using
`grep -vqz`, `(! grep ...)` is more readable.

The brackets are necessary as `! grep` will not trigger `set -e`[0], so we
run it inside a subshell to use its non-zero exit code.

[0]: https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#The-Set-Builtin
2024-10-27 21:26:19 +11:00
Michael Hoang
7840909b00
Merge pull request #1115 from PhilipBorgesen/align_usage
darwin-rebuild: Align usage description with implementation
2024-10-25 14:25:25 +11:00
Philip Børgesen
c98bb238b1 darwin-rebuild: Align usage description with implementation
This change updates the usage description of darwin-rebuild.sh as
follows:

 * Add options:

     --print-build-logs / -L
     --no-registries
     --commit-lock-file
     --no-write-lock-file
     --override-input

 * Specify that --no-flake and the flake related options are
   mutually exclusive.

 * Specify that --keep-going and -k are aliases.

 * Specify that --keep-failed and -K are aliases.

 * Correct the description of --update-input; only one value follows.

The --no-build-hook argument remains undocumented, like for nix.
2024-10-25 05:07:51 +02:00
Michael Hoang
8c02940d70 users: ensure Full Disk Access is granted before trying to delete users 2024-10-23 01:29:01 +11:00
Michael Hoang
9ee30f2534 darwin-rebuild: add comments explaining the custom sudo logic 2024-10-23 01:11:40 +11:00
Antoine Cotten
b64c1d036f
tools: fix darwin-rebuild changelog
The script returns early when $systemConfig is empty, which prevents the
changelog from being displayed.
2024-09-11 18:27:53 +02:00
Michael Hoang
902d6b65d3 Set default flake directory as /etc/nix-darwin
Backported from 9995a5d59c/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh (L349-L353)
2024-07-13 14:14:11 +10:00
Rubikoid
24f7a3fdf4
Move --offline to group of same behaviour flags 2024-05-18 16:25:53 +03:00
Rubikoid
2a2a311fca
Fix help 2024-05-07 16:02:26 +03:00
Rubikoid
3524643c3d
Fix --offline
Add --substituters flag
2024-05-07 16:02:26 +03:00
Rubikoid
bb17a88bc0
Add offline flag to darwin-rebuild.sh 2024-05-07 16:02:26 +03:00
Andrew Marshall
5c2700533c darwin-uninstaller: Fix when using nixpkgs.config.allowAliases = false 2024-03-06 08:04:42 -05:00
Thane Gill
492944b0f2
Update darwin-rebuild.zsh-completions
Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
2024-01-28 18:12:36 -08:00
Thane Gill
0f0478efa6 Add zsh completions to darwin-rebuld by default 2024-01-27 19:37:27 -08:00
Rafael Kitover
f81fbc2bf7
darwin-rebuild: fix sudo invocation on High Sierra
The version of sudo on macOS 10.13 High Sierra does not support the
`--preserve-env=LIST` option syntax, which is used here to preserve
PATH.

Override sudo with a shell function that checks for the availability of
this option syntax, and do not pass PATH otherwise.

Also move the prefix env command in the sudo invocations into the new
sudo function.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2023-12-22 14:40:13 +00:00
Graham Christensen
09284ab00b Install darwin-uninstall by default, which includes the 'empty' config it switches to
Co-Authored-By: Michael Hoang <enzime@users.noreply.github.com>
2023-11-16 17:47:24 +11:00
Roman Novak
a4b4cf70dc
Update pkgs/nix-tools/darwin-rebuild.sh
Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
2023-11-09 18:09:45 +01:00
Roman Novak
26a59d504b
fix(#798): darwin-rebuild support for Cyberark EPM
restore sudo environment PATH when Cyberark EPM is setting secure_path in sudo config. Fixes LnL7/nix-darwin/issues/798
2023-11-06 10:24:41 +01:00
zowoq
ab817e5d0e darwin-rebuild: add -H to sudo for $systemConfig/activate 2023-09-25 14:02:52 +10:00
Carl Thomé
22419fddf7
Use LocalHostName 2023-09-19 00:59:27 +02:00
Arvin Sevilla
d21a7e30e6
Update pkgs/darwin-installer/default.nix
Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
2023-08-13 18:04:12 +08:00
Arvin Sevilla
5c22b241f7
chore(installer): capitalize the default option when reading user input 2023-08-13 16:54:23 +08:00
Michael Hoang
0dafe2170d Add darwin-version command 2023-07-14 23:06:46 +10:00
Michael Hoang
8eb09d4d0b uninstaller: fix removing /Applications/Nix Apps 2023-07-12 18:56:13 +10:00
Michael Hoang
ac9a366aed uninstaller: remove /Applications/Nix Apps 2023-07-11 18:59:05 +10:00
Michael Hoang
7881727017 installer: match flaky installation logic 2023-07-11 18:59:05 +10:00
Michael Hoang
5288a72354 Allow flaky installation with darwin-rebuild 2023-07-11 18:59:05 +10:00
Michael Hoang
f70f90c422 flake: add packages.darwin-{option,rebuild} 2023-07-11 18:59:05 +10:00
Bernardo Meurer
9af7fe60b6
feat(darwin-rebuild): support --refresh
This flag allows forcing remote flakes (e.g. `github:foobar/nix-config`)
to be force-refreshed, which is required for quickly
iterating/activating a remote config.
2023-06-28 12:47:32 -04:00
Daiderd Jordan
cb37c35e33
fix darwin-option descriptions
Also drops the eval hacks in favour of jq.
2023-06-25 13:03:52 +02:00
Michael Hoang
1ba9ae3d21 darwin-installer: fix /run not getting created 2023-06-09 15:25:55 +10:00
Konrad Malik
d0e36622c1
fix: in URI use proper groups 2023-04-29 14:49:06 +02:00
Konrad Malik
fad0282b5f
add '://' to built flake uri 2023-04-29 14:49:06 +02:00
Domen Kožar
87b9d090ad
Merge pull request #550 from n8henrie/issue_549
Add support for submodules in flakes
2023-01-09 20:10:39 +00:00
Nathan Henrie
5452c8c638 Add support for submodules in flakes
Fixes https://github.com/LnL7/nix-darwin/issues/549
2022-12-14 03:44:26 -07:00
saccarosium
38463b15ec darwin-rebuild: fixing logic error in if statement 2022-12-08 10:00:51 +01:00
saccarosium
da843c0dde darwin-rebuild: use --no-link for flake builds 2022-12-08 09:48:45 +01:00
LightQuantum
184f30c864
Fix darwin rebuild fails with flake and dry-run 2022-10-10 20:24:46 +08:00
Malo Bourgon
1da877d28c Add -H to sudo nix-env [...] to deal with warning
After NixOS/nix#6676, the following warning is displayed when running
`darwin-rebuild switch`:
  warning: $HOME ('/Users/jamie') is not owned by you, falling back to the
  one defined in the 'passwd' file.
2022-08-29 11:59:54 -07:00
Malo Bourgon
ffc8ec5c9a Add .nix-defexpr to NIX_PATH the way the NixOS module does 2022-08-16 17:41:08 -07:00
Malo Bourgon
7e74c1c9fb Move build user options to nix module to improve overlap with NixOS
Also add `config.ids` like in NixOS.
2022-08-16 10:41:51 -07:00