Commit Graph

17 Commits

Author SHA1 Message Date
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Jörg Thalheim
7b912bcafe make nix.settings-system-features default mergeable again 2025-02-18 15:30:43 +07:00
Christian Kögler
ea9594ba15 nixos/nix: restructure default for system-features
Assign default for option system-features at the common place. It
allows use to re-use the default value in cause of setting the option.
2025-01-11 11:56:44 +01:00
Sandro Jäckel
280e9a5ca4
nixos/nix: move trusted-user to config
This avoids having to define root when trying to add another user as
trusted user, similar to the other options.
2024-07-30 18:18:57 +02:00
stuebinm
6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
Silvan Mosberger
308671dbe8 nixos/nix: Fix example for nix.settings option
Attribute sets aren't valid option values, needs to be a list
2024-03-19 22:55:19 +01:00
Guillaume Girol
1f26e67560
Merge pull request #278064 from symphorien/nix_config_extra
nixos/nix: add workaround for https://github.com/NixOS/nix/issues/9487
2024-03-15 22:46:51 +01:00
Guillaume Girol
5b274d5f01 nixos/nix: add workaround for https://github.com/NixOS/nix/issues/9487
Nix has a suprising behavior where if the option `extra-foo` is set before `foo`, then setting `foo` overwrites the setting for `extra-foo`. This is reported as https://github.com/NixOS/nix/issues/9487, and will likely not be fixed any time soon.

This works around this issue by always putting `extra-*` settings after non-extra ones in the nixos-generated `/etc/nix.conf`.
2024-03-03 17:03:46 +01:00
Colin
a65967a12c nixos/nix: documentation: fix outdated reference to /etc/nix.conf 2024-02-24 21:29:38 +11:00
Robert Hensing
2d0f4a7ec1 nixos/nix.nix: Support new Nix 2.20 command syntax
Otherwise it shows a deprecation warning, which is escalated to
an error. For context, see
https://github.com/NixOS/nixpkgs/pull/139075#discussion_r733615550
2023-12-01 12:14:21 +01:00
Robert Hensing
12cb2b0b40 nixos: flakes.nix -> nix-flakes.nix
I guess this is what people expect to find. Thanks Sandro.
2023-07-06 23:27:17 +02:00
Robert Hensing
c83ad0598b nixos/*nix*: Update module impl docs and link related modules
Something extra for the readers.
2023-07-06 20:00:10 +02:00
Robert Hensing
4bbd44908c nixos/config/nix: Move extraOptions 2023-07-05 14:54:27 +02:00
Robert Hensing
19e33831c6 nixos/config/nix: Move nix.check* 2023-07-05 14:54:26 +02:00
Robert Hensing
d73da5b868 nixos/config/nix: Move nix.settings 2023-07-05 14:54:26 +02:00
Robert Hensing
6649d1e369 nixos/config/nix: Move nixConf 2023-07-05 13:03:32 +02:00
Robert Hensing
2fa416732c nixos/config/nix: Move legacyConfMappings 2023-07-05 12:52:56 +02:00