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

1704 commits

Author SHA1 Message Date
Sebastian Reuße
6ad463a764
zsh: don't be noisy when scripts are run with -u
When a script specifies the shell option "nounset" as part of the
shebang (e.g., via "#!/usr/bin/env -S zsh -u"), our initialization
scripts would produce error messages of the form:

    __ETC_FOO_SOURCED: parameter not set

These messages could probably be confusing to users when running such
scripts. By providing a fall-back in the parameter expansion, we can
avoid them.

This patch does not address interactive shell start-up, where such
messages may (or may not) be less problematic.

NixOS/nixpkgs@7d84dbdf5b
2024-09-11 14:07:24 +02:00
Jörg Thalheim
7e6c548eef
zsh: let children shells set their fpath
Currently zshenv by default only sets fpath without exporting it. A
parent shell would also not set those variables usually as they are
shell local.

It also sources a file called set-environment but this is protected by
an environment variable called __NIX_DARWIN_SET_ENVIRONMENT_DONE. Hence
any modification done by the parent shell should persist as long as
__NIX_DARWIN_SET_ENVIRONMENT_DONE is not unset.

This behavior deviates from what we do in bashrc and breaks common
setups such as tmux/mosh or screen.

NixOS/nixpkgs@55819e6c86
2024-09-11 13:01:26 +02:00
Michael Hoang
f4f18f3d72
Merge pull request #1069 from emilazy/push-mmluvksnvxpy
{ids,checks}: update for new builder UID/GID values
2024-09-11 15:24:04 +10:00
Emily
88b97aa49c {ids,checks}: update for new builder UID/GID values 2024-09-11 01:17:01 +01:00
Emily
9c60c95008 checks: make oldBuildUsers check fail hard
Checking for the Sequoia stuff won’t work properly if a system is
still in this old state. Best to be loud about it to deal with any
straggler systems that haven’t yet dealt with this issue.
2024-09-11 00:37:08 +01:00
Emily
2af5f0fb9e checks: factor out nix.useDaemon check 2024-09-11 00:37:08 +01:00
Emily
98189683a4 ci: use Determinate Systems installer for stable Nix 2024-09-11 00:37:08 +01:00
Emily
f29c6fc015 ci: use Nix 2.24.6 for unstable jobs
Includes the Sequoia installer fixes.
2024-09-11 00:37:08 +01:00
Emily
bda49fe089 ci: update stable Nixpkgs to 24.05 2024-09-11 00:37:08 +01:00
Emily
8220423c02
Merge pull request #1068 from emilazy/push-lkuxlvpkttsn
tests/{networking-hostname,users-groups}: update for `lib.escapeShellArg` change
2024-09-11 00:32:33 +01:00
Emily
4c96bd694b
Merge pull request #1066 from antoineco/zsh/fpath
Backport Zsh fpath mangling from NixOS
2024-09-10 23:31:41 +01:00
Emily
95f063ea06 tests/users-groups: update for lib.escapeShellArg change 2024-09-10 22:50:01 +01:00
Emily
dea497f67a tests/networking-hostname: update for lib.escapeShellArg change 2024-09-10 22:11:20 +01:00
Sebastian Reuße
15f64efcaf
zsh: prefer Nix completions these from Zsh package
Zsh ships some rudimentary completions for programs where upstream also
ships their own completions (e.g., curl). So as not to shadow those
completions, we need to prepend to the fpath instead of appending.

NixOS/nixpkgs@8dad5a2239
2024-09-10 21:40:11 +02:00
Jan Malakhovski
4d59f660bc
zsh: move fpath init from /etc/zshrc to /etc/zshenv
We want these to be set even when /etc/zshrc loading is disabled.

NixOS/nixpkgs@f70e3f3738
2024-09-10 21:35:35 +02:00
Michael Hoang
5b2d8e9a47
Merge pull request #1064 from natsukium/fix/typo
checks.nix: fix typo
2024-09-10 23:37:57 +10:00
natsukium
ec76c31dbd
checks.nix: fix typo 2024-09-10 22:20:22 +09:00
Michael Hoang
7655918380
Merge pull request #1055 from siriobalmelli/sb/fix/github-runners
nixos/github-runner: fix build failure
2024-09-06 23:21:49 +10:00
Sirio Balmelli
c334175319
nixos/github-runner: quote comma separators so as to pass shellcheck
Shellcheck complains:

       > args=(
       >      ^-- SC2054 (warning): Use spaces, not commas, to separate array elements.

Quote the --labels argument to resolve.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2024-09-06 14:57:35 +02:00
Emily
a55b3f1ab4
Merge pull request #1059 from emilazy/push-oooqqvvowrxt
users: allow arbitrary group IDs
2024-09-05 14:51:52 +01:00
Emily
97e0f72759 users: allow arbitrary group IDs
The upstream Nix UID/GID changes for Sequoia will require us to manage
a group with GID 350. That will require more work on our end to ensure
compatibility and a working migration path, but this is enough to
allow hacking around it locally in system configurations for now.
2024-09-05 10:39:01 +01:00
Michael Hoang
92bd25c29f
Merge pull request #1058 from Enzime/linux-builder-apply
linux-builder: make `package.nixosConfig` accurate
2024-09-05 16:11:19 +10:00
Michael Hoang
e1b6f307ec linux-builder: make package.nixosConfig accurate 2024-09-05 13:54:53 +10:00
Michael Hoang
7c4b53a7d9
Merge pull request #1051 from booxter/suppress-gpg-connect-agent-stderr
gpg: Suppress stderr from gpg-connect-agent on shell init
2024-09-01 21:15:02 +10:00
Michael Hoang
c8d3157d1f
Merge pull request #1050 from coreyjewett/master
Add sha256 for DeterminateSystems Nix installer 0.22.0
2024-08-30 15:14:53 +10:00
Ihar Hrachyshka
75d14c62cb gpg: Suppress stderr from gpg-connect-agent on shell init
In some scenarios, the command may fail, e.g. when the shell is executed
with a different $HOME from where gpg agent is configured to run from.

(E.g. this happens in kitty terminal test suite.)

This patch will suppress stderr errors on tty in this situation.

Note that zsh does not allow to suppress execution of /etc/zshenv on
startup, so it's impossible to skip it in the test suite environment.

An alternative would be to set IN_NIX_SHELL in the test suite, but this
was rejected in upstream:

https://github.com/kovidgoyal/kitty/pull/7800

There's also a kitty package specific fix posted here but this may be
unnecessary once nix-darwin is patched here:

https://github.com/NixOS/nixpkgs/pull/338070

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2024-08-29 16:37:56 -04:00
Corey Jewett
544db3691c Add sha256 for DeterminateSystems Nix installer 0.22.0 2024-08-29 10:51:52 -07:00
Michael Hoang
ac5694a0b8
Merge pull request #1044 from Enzime/add/known-hash
etc: add known hash for DetSys installer 0.20.0+
2024-08-25 14:56:10 +10:00
Michael Hoang
2bd4949af3 etc: add known hash for DetSys installer 0.20.0+ 2024-08-25 14:36:37 +10:00
Michael Hoang
ea319a7379
Merge pull request #1042 from Enzime/update/README
Use flake based command for uninstaller in README
2024-08-24 13:25:41 +10:00
Michael Hoang
2861a0421b Use flake based command for uninstaller in README
Fixes #918

This command should work on both non-flake and flake based setups as it
does not require `nixpkgs` to be set in `NIX_PATH`.

Also remove the manual install section as it is unmaintained as far as I
can tell.
2024-08-24 13:07:05 +10:00
Michael Hoang
a8968d88e5
Merge pull request #1038 from isabelroses/installTools
feat: system.disableInstallerTools
2024-08-22 14:09:15 +10:00
isabel
c06794de03
feat: system.disableInstallerTools 2024-08-21 14:29:54 +01:00
Daiderd Jordan
d6703b9887
Merge pull request #1039 from Enzime/add/funding
.github: add sponsorship details
2024-08-21 07:58:18 +02:00
Michael Hoang
8ef57d17a4 .github: add sponsorship details 2024-08-21 10:32:59 +10:00
Michael Hoang
076b9a905a
Merge pull request #1026 from thecaralice/nochan
Allow disabling channels
2024-08-17 11:59:09 +10:00
Alice Carroll
5afa71b413
fix: respect user nixPath configuration 2024-08-17 02:51:01 +03:00
Alice Carroll
691a590bff
feat: allow disabling channels 2024-08-17 02:51:01 +03:00
Alice Carroll
d5dba1c6f5
refactor: rename environment.postBuild to environment.extraSetup 2024-08-17 02:50:56 +03:00
Michael Hoang
91010a5613
Merge pull request #1023 from malko42/swap-ctrl-fn
(feature) Add swapLeftCtrlAndFn
2024-08-06 08:00:07 +02:00
Maxime Daffis
636d1a09d8 (feature) Add swapLeftCtrlAndFn
Use this and never find yourself again hitting fn because of muscle
memory! (you can even physically swap the keycaps, at least on M series)

Keycodes have been pulled from https://hidutil-generator.netlify.app/
and the hex value has been converted to a base 10 int.
2024-08-05 13:00:32 +02:00
Michael Hoang
f7142b8024
Merge pull request #1002 from malko42/window-manager
(feature) Add Stage Manager (com.apple.WindowManager) settings
2024-08-02 16:34:32 +02:00
Maxime Daffis
3dd14e466c (feature) Add Stage Manager (com.apple.WindowManager) settings as system.defaults.windowmanager
All credits go to @AlexOwl. Their [PR](https://github.com/LnL7/nix-darwin/pull/505)
looked abandonned so I reported their changes and addressed the change
requests.
2024-08-02 01:17:45 +02:00
Emily
b47af86286
Merge pull request #1022 from Mic92/ssh
programs.ssh: add certificate authorities
2024-08-01 09:24:02 +01:00
Jörg Thalheim
cf45edbf27 programs.ssh: add certificate authorities 2024-07-31 19:34:17 +02:00
Emily
7e08a9dd34
Merge pull request #1018 from Enzime/fix/github-runners-work-dir
github-runners: move `workDir` outside of `/run`
2024-07-31 18:00:20 +01:00
Emily
0413754b3c
Merge pull request #1012 from Enzime/fix/dock-not-running
defaults: only restart Dock when user is logged in
2024-07-27 13:17:26 +01:00
Emily
980c7066fc
Merge pull request #1019 from qowoz/flatten
`mapAttrsFlatten` -> `mapAttrsToList`
2024-07-27 12:38:35 +01:00
zowoq
e88eb66c2b mapAttrsFlatten -> mapAttrsToList
deprecated in 473e469d5a
2024-07-27 13:37:28 +10:00
Michael Hoang
dc8e1f4839 github-runners: move workDir outside of /run
As `/run` gets recreated every reboot and we can't specify dependencies
for launchd, creating the `workDir` every reboot will require extra
complexity with a separate daemon that runs as `root` otherwise it won't
have sufficient privileges.

As we clean the `workDir` when the service first starts anyway, it ends
up being the same.
2024-07-27 10:41:18 +10:00