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

1865 commits

Author SHA1 Message Date
Emily
4b3c0d353b
Merge pull request #1141 from Enzime/push-yxmxmspuooto
uninstaller: improve
2024-11-07 23:58:44 +00:00
Michael Hoang
fa7b46fa77
Merge pull request #1143 from YorikSar/fix-github-runner-labels
github-runner: Fix labels for different nixpkgs versions
2024-11-07 12:00:23 +00:00
Yuriy Taraday
110d49af63 github-runner: Fix labels for different nixpkgs versions
Changes to escapeShellArg introduced in
https://github.com/NixOS/nixpkgs/pull/333744 made different versions of
nixpkgs behave differently. If current nix-darwin is used with nixpkgs
before that change, labels end up having labels quoted twice
(see https://github.com/LnL7/nix-darwin/issues/1085), but without
changes from https://github.com/LnL7/nix-darwin/pull/1055, with new
nixpkgs, labels end up not quoted at all, and ShellCheck ends up
complaining that commas might have been used as array item separator
(see https://www.shellcheck.net/wiki/SC2054).

Use the old version of escapeShellArg to always escape the list of
labels and make nix-darwin work with both old and new versions of
nixpkgs.

Fixes https://github.com/LnL7/nix-darwin/issues/1085
2024-11-07 11:46:08 +01:00
Michael Hoang
222c3cb558 ci: fix uninstaller failing to run in install-against-unstable 2024-11-07 18:53:19 +11:00
Michael Hoang
3a89b61432 uninstaller: check nix-daemon was correctly reinstalled 2024-11-07 18:52:15 +11:00
Michael Hoang
7bbc7c5db6 ci: test uninstallation of nix-darwin using flakes 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
158198a6e3
Merge pull request #1139 from Enzime/push-ssqvumruwtmy
system: run `shellcheck` on `activate` and `activate-user` scripts
2024-11-07 07:16:23 +00:00
Michael Hoang
79608947e2 buildkit-agents: don't use mkdir -p -m
As `cfg.dataDir` will be the `home` of the Buildkite Agent user, it is
guaranted to exist so we don't need to use the `-p` flag.
2024-11-07 17:31:22 +11:00
Michael Hoang
3b738c765d github-runner: replace mkdir -p -m with umask
`mkdir -p -m` only applies the mode on the deepest directory which could
be a security issue so we use umask to be more careful.
2024-11-07 17:31:22 +11:00
Michael Hoang
cf130aa957 users: don't generate ensurePerms when no users to manage 2024-11-07 17:20:00 +11:00
Michael Hoang
32814a6eb1 users: replace runtime check to prevent deleting root with assertion
This fixes SC2050 as `${name} == "root"` will be generated as a constant
expression.
2024-11-07 17:20:00 +11:00
Michael Hoang
fd510a7122 system: replace for f in $(ls ...) with for f in .../*
Fixes SC2045 but has one quirk which is if the bash glob doesn't match
anything it'll treat it as a string and run the loop once with
`f=.../*` so we need to check that `$f` actually exists.
2024-11-07 17:20:00 +11:00
Michael Hoang
041996803a treewide: fix shellcheck warnings and errors 2024-11-07 17:20:00 +11:00
Michael Hoang
9afef9950f checks: move manual /run instructions to activation 2024-11-07 17:15:22 +11:00
Michael Hoang
3ea1144938 system: run shellcheck on activate and activate-user scripts 2024-11-07 17:15:22 +11:00
Emily
366b99abfe
Merge pull request #1140 from Enzime/aarch64-tests
release: fix tests not running on `aarch64-darwin`
2024-11-07 06:02:34 +00:00
Michael Hoang
2af06b0862 examples: clean up 2024-11-07 15:26:53 +11:00
Michael Hoang
223a920ab4 ci: upgrade actions/checkout 2024-11-07 15:26:53 +11:00
Michael Hoang
37b591bd8b ci: remove unused workflows 2024-11-07 15:26:53 +11:00
Michael Hoang
e0f243d17e ci: run nix flake check 2024-11-07 15:26:53 +11:00
Michael Hoang
68637ee7db flake: expose jobs from release.nix as a flattened attrset 2024-11-07 15:26:53 +11:00
Michael Hoang
c13549d7a6 examples: drop ofborg example
We decided to drop this example as the package is not available in
Nixpkgs and we won't be able to import it easily and keep this example
evaluating as a useful smoke test. The code in this example is already
documented under `services.ofborg.*` so any interested users can still
find out how to set up `ofborg`.
2024-11-07 15:24:16 +11:00
Michael Hoang
569153467b ofborg: automatically add ofborg to known{Users,Groups} 2024-11-07 11:41:51 +11:00
Michael Hoang
dd48cbd776 examples: fix evaluation 2024-11-07 11:41:51 +11:00
Michael Hoang
56ac6182d3 release: remove unnecessary use of release-lib 2024-11-07 11:41:51 +11:00
Michael Hoang
c904f6cdcb release: rename release to release-lib to match NixOS
2d2a9ddbe3/pkgs/top-level/release.nix (L56-L58)
2024-11-07 11:41:51 +11:00
Michael Hoang
8a03b1850b release: remove package jobs 2024-11-07 11:41:51 +11:00
Michael Hoang
e11dd028d3 release: remove unstable job
This job is actually in Nixpkgs at 2d2a9ddbe3/pkgs/top-level/release.nix (L90-L139).
2024-11-07 11:41:51 +11:00
Michael Hoang
1a8c6cac8c release: fix tests not running on aarch64-darwin 2024-11-07 11:41:51 +11:00
Michael Hoang
98e7dba872
Merge pull request #909 from motheki/fast-syntax-highlighting-support
Add support for zsh-fast-syntax-highlighting
2024-11-06 07:31:39 +00:00
Trevor Opiyo
48e5c8de1a
Update modules/programs/zsh/default.nix
Changes added by Enzime

Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
2024-11-06 01:10:24 -06:00
Trevor Opiyo
897fc37c47
Update default.nix
Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
2024-11-05 08:16:35 -06:00
Emily
0e3f3f017c
Merge pull request #1146 from emilazy/push-ylsrzmyxtlor
prometheus-node-exporter: fix log permissions
2024-11-05 04:09:18 +00:00
Emily
84d14d4043 prometheus-node-exporter: fix log permissions
The daemon won’t start as the assigned user doesn’t have
permissions to create the log file.
2024-11-05 03:00:55 +00:00
Michael Hoang
2f05a81019
Merge pull request #1145 from qowoz/shellcheck-timezone
time: shellcheck fix
2024-11-05 01:54:14 +00:00
zowoq
6ff3a49ceb time: shellcheck fix
https://www.shellcheck.net/wiki/SC2143
2024-11-05 11:12:21 +10:00
Michael Hoang
5d89120785
Merge pull request #1144 from Enzime/push-mkkptszzrnys
ci: switch to `macos-13`
2024-11-05 00:11:47 +00:00
Michael Hoang
07db4e57d3 ci: switch to macos-13
The `macos-12` runner image will be removed by 3 Dec 2024.
2024-11-05 10:41:56 +11:00
Emily
189d2d422c
Merge pull request #1129 from mweinelt/node-exporter
module: add prometheus-node-exporter service
2024-11-04 05:40:01 +00:00
Michael Hoang
4652874d01
Merge pull request #1138 from Enzime/push-trqkuxxuyztn
fix: submodules not working with Nix 2.24
2024-11-03 02:14:38 +00:00
Michael Hoang
53b9de4d6c ci: remove tests to ensure submodules work 2024-11-03 12:56:25 +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
146629a543
Merge pull request #1125 from aschleck/new-window-path
Configure the folder that new Finder windows open
2024-11-03 10:19:55 +11:00
Michael Hoang
446e1ef8e1
Merge pull request #1130 from aschleck/fn-key
Allow configuring the fn key action
2024-11-03 10:17:21 +11:00