Commit Graph

1128 Commits

Author SHA1 Message Date
Lily Foster
b367b9cf87
Merge pull request #241565 from SuperSandro2000/nox-python
nixos/no-x-libs: use pythonPackagesExtensions to construct python ove…
2023-08-07 10:56:27 -04:00
r-vdp
44a7059bf2
nixos/update-users-groups: set expiry correctly for new users 2023-08-02 13:51:41 +02:00
Sandro Jäckel
0d4c3913b2
nixos/no-x-libs: use pythonPackagesExtensions to construct python overlay
to construct it for all supported python package sets at the same time
2023-08-01 15:36:15 +02:00
Gabriel Fontes
ff8b69941a
nixos/qt: install qt6gtk2 when using gtk2
Now qt6 apps are correctly themed when using platformTheme gtk2.
2023-07-27 15:39:30 -03:00
Sandro Jäckel
4c07356e3d
nixos/packages: fix typo preventing mkRenamedOptionModule from working 2023-07-25 14:43:40 +02:00
Robert Hensing
c9f9df2f8e
Merge pull request #245038 from R-VdP/fix_nix_channel
nixos/nix-channel: only try to remove the nix-channel binary if it exists
2023-07-25 11:25:15 +02:00
Sandro Jäckel
83793ca898
nixos/fonts: rename fonts.enableDefaultFonts to fonts.enableDefaultPackages
to better fit the renamed fonts.packages
2023-07-25 00:55:25 +02:00
Sandro Jäckel
f9fdeb2dbc
nixos/ghostscript: evaporate the extra whitespace 2023-07-24 17:34:39 +02:00
Sandro Jäckel
b0c67b4b6e
treewide: rename fonts.fonts to fonts.packages 2023-07-24 17:34:39 +02:00
Sandro Jäckel
5162df3239
nixos/fonts: rename fonts.fonts option to fonts.packages, other cleanups
fonts.fonts is not a great name and this also resolves a TODO.
2023-07-24 17:34:37 +02:00
r-vdp
b825f65c90
nixos/nix-channel: only try to remove the nix-channel binary if it exists
It may not be there if `system.disableInstallerTools = true`.
2023-07-24 10:34:48 +02:00
r-vdp
668e2dafb6
nixos/nix-channel: fix editorconfig warnings and apply nixpkgs-fmt 2023-07-23 15:39:32 +02:00
Gerg-L
bf383adf0a nixos/user-groups: Add to $NIX_PROFILES paths 2023-07-18 23:33:18 -04:00
Robert Hensing
8ad59ed1b2
Merge pull request #242098 from hercules-ci/nixos-no-nix-channel
nixos: Disable nix-channel
2023-07-18 15:27:24 +02:00
github-actions[bot]
a3b43106c9
Merge master into staging-next 2023-07-13 18:01:24 +00:00
Bjørn Forsman
df1eee2aa6 nixos: show which files are related to "not applying GID/UID change"
I initially thought it was related to /var/lib/nixos/{gid-map,uid-map},
but it seems that to migrate GID/UID you have to edit
/etc/{group,passwd} (and update GID/UID in all files). So mention those
files in the warning messages.
2023-07-13 17:21:36 +02:00
Ramses
1bee79f9f7
nixos/swap: make sure all kernel modules are loaded before creating swap devices. (#239163)
Co-authored-by: iliana etaoin <iliana@buttslol.net>
2023-07-13 17:12:54 +02:00
Robert Hensing
a1d0ee8c50
nixos/nix-channel: Apply suggestions from code review
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-07-08 20:49:37 +02:00
github-actions[bot]
e949ec41bd
Merge master into staging-next 2023-07-08 18:01:04 +00:00
Joerie de Gram
1785fe6c01 nixos/i18n: correct defaultText for supportedLocales 2023-07-08 16:43:22 +02:00
Robert Hensing
61afc4d166 nixos/nix-channel: Take care of NIX_PATH's non-empty default when disabled 2023-07-07 23:12:39 +02:00
Robert Hensing
d00e242b80 nixos: Add nixos.channel.enable
For those who wish to get rid of nix-channel.
2023-07-07 19:00:06 +02:00
github-actions[bot]
da44aac0b1
Merge master into staging-next 2023-07-07 12:01:26 +00:00
Sandro Jäckel
88d7aa56e1
nixos/nix*: remove not necessary imports
We do not really declare module dependencies anywhere else and it would
a nousance to move any file if many other referenced it without being
necessary. Also most higher level modules depend on most of the lower
level ones.
So removing this because it can only potentially cause weird issues.
2023-07-07 11:01:12 +02: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
07de9b62cc nixos/*nix*: Add imports as inherently necessary
Albeit not technically necessary because of nixos//module-list.nix
2023-07-06 19:48:22 +02:00
Robert Hensing
fad172a366 nixos/config/nix-channel: Move NIX_PATH logic 2023-07-05 14:54:29 +02:00
Robert Hensing
5c0c96a828 nixos/config/nix-channel: Factor out root channel initialization 2023-07-05 14:54:29 +02:00
Robert Hensing
1c772cd857 nixos/config/flakes: Factor out 2023-07-05 14:54:28 +02:00
Robert Hensing
d6a68f0542 nixos/config/nix-remote-build: Factor out 2023-07-05 14:54:27 +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
github-actions[bot]
0f844d9b01
Merge staging-next into staging 2023-07-03 18:01:46 +00:00
Lily Foster
e9207b0501
nixos/*: unhide remaining systemd stage-1 options
These options were missed in NixOS/nixpkgs#226237, but they all were
specifically added for systemd stage-1.
2023-07-03 08:41:38 -04:00
github-actions[bot]
c5b82a046f
Merge staging-next into staging 2023-06-28 18:01:51 +00:00
dariof4
5c13477d40
nixos/fontdir: add otb to font regex (#239802) 2023-06-28 14:22:38 +02:00
Sandro Jäckel
1370fe7c36
nixos/no-x-libs: add python3.pkgs.matplotlib 2023-06-27 11:29:24 +02:00
Artturin
ed55524562 nixos/malloc: add back maybe unnecessary line 2023-06-22 17:28:44 +03:00
Artturi
920b833494
Merge pull request #238459 from SuperSamus/vm.max_map_count 2023-06-22 11:37:48 +03:00
Martino Fontana
e1a6c85c2b nixos/sysctl: raise default vm.max_map_count to 1048576 2023-06-21 19:25:42 +02:00
github-actions[bot]
52cf9e3e3b
Merge staging-next into staging 2023-06-08 18:02:03 +00:00
Victor Engmark
b0a9abedea refactor: Use dummy variable name for unused value
As recommended by ShellCheck
<https://github.com/koalaman/shellcheck/wiki/SC2034>.
2023-06-08 15:11:35 +12:00
Sandro Jäckel
5896d330e9
nixos/no-x-libs: disable x11 of gst_all_1.gst_plugins_good 2023-06-07 21:39:09 +02:00
Sandro Jäckel
b66a6ce01b
nixos/no-x-libs: gst_all_1.gst-plugins-base: disable wayland to disable GL
GL was already participially disabled because X11 is disabled and lead to
the following error when building gst-plguins-good:

```
Did not find CMake 'cmake'
Found CMake: NO
Run-time dependency gstreamer-gl-prototypes-1.0 found: NO (tried pkgconfig and cmake)
Looking for a fallback subproject for the dependency gstreamer-gl-prototypes-1.0

meson.build:328:2: ERROR: Neither a subproject directory nor a gst-plugins-base.wrap file was found.
```
2023-06-07 21:39:06 +02:00
github-actions[bot]
71a0dc0490
Merge staging-next into staging 2023-06-06 18:01:51 +00:00
José Romildo Malaquias
4607765abc
Merge pull request #220054 from Scrumplex/init-qt6ct
qt6ct: init at 0.8
2023-06-06 09:40:27 -03:00
Sergei Trofimovich
4e2cfde94e modules: fix fontconfig.nix to use '$dst', not 'dst'
Without the change non-default configs like:

    fonts.fontconfig.subpixel.rgba = "rgb"

fail to build the system as:

    fontconfig-conf> ln: failed to create symbolic link 'dst/': No such file or directory
2023-06-04 09:45:28 +01:00
Sefa Eyeoglu
bd97ff5ff4 nixos/fontconfig: Change default antialiasing style to greyscale instead of subpixel
fontconfig before version 2.13.1 was apparently implicitly not using
subpixel antialiasing. The fontconfig NixOS module deviated from this,
using subpixel antialiasing with `rgb` layout by default. In fontconfig
2.14.1, subpixel antialiasing was inadvertently enabled as the default:
2b6afa02ab

According to https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/337,
that deviates from GNOME/GTK’s defaults, which resulted in apps taking the
settings directly from fontconfig (e.g. Firefox) from diverging from GNOME
programs.

The change was subsequently reverted in 2.14.2, choosing the greyscale
antialiasing explicitly: 030759b74f
Let’s reflect this default setting in the NixOS module.

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-03 16:02:22 +02:00
Sefa Eyeoglu
b5d2d701d1 nixos/fontconfig: refactor antialias option for fontconfig 2.14.1
`sub-pixel` has been enabled by default since 2.14.1: 2b6afa02ab
`antialias` since 2.14.1: 0825a178e8
`lcdfilter` since 2.13.95: e1c7c6d744
`hintstyle` since 2.12.1: 98434b3392

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-03 16:02:22 +02:00
Sandro Jäckel
94baf8bfd9
nixos/no-x-libs: add gst-plugins-bad 2023-05-24 20:49:08 +02:00
figsoda
701bcdbead nixos: fix typos 2023-05-19 22:31:04 -04:00
Sefa Eyeoglu
5c08d4fa3e
nixos/qt: also install qt6ct if using qt5ct
If QT_QPA_PLATFORMTHEME is set to qt5ct, Qt 6 apps can utilize qt6ct, to
achieve consistent theming across the two major versions.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-05-18 12:45:01 +02:00
Mikaela Allan
4101d3b56f
nixos/config/swap: resolve swapfile issue !232229 2023-05-16 10:48:53 -04:00
Ryan Lahfa
285330f081
Merge pull request #230153 from mklca/swap-encrypt-enhancement
nixos/config/swap: improve randomEncrytion
2023-05-14 19:01:56 +02:00
github-actions[bot]
079dc4c27d
Merge master into staging-next 2023-05-11 00:02:13 +00:00
ajs124
30bea8d82d nixos/*: remove boot.grub.version 2023-05-10 21:51:26 +02:00
github-actions[bot]
b5b52a946a
Merge staging-next into staging 2023-05-09 18:02:32 +00:00
Sandro
8f6cd53206
Merge pull request #229022 from SuperSandro2000/nox-mpv-wayland
nixos/no-x-libs: disable wayland for mpv
2023-05-09 19:07:16 +02:00
github-actions[bot]
54295bf976
Merge staging-next into staging 2023-05-08 18:02:09 +00:00
Alyssa Ross
ecc1ec2c72 llvmPackages_latest: move to aliases.nix
Because llvmPackages_latest is used in Nixpkgs, by quite a few
packages, it's difficult to keep it up to date, because updating it
requires some level of confidence that every package that uses it is
going to keep working after the update.  The result of this is that
llvmPackages_latest is not updated, and so we end up in the situation
that "latest" is two versions older than the latest version we
actually provide.  This is confusing and unexpected.

"But won't this end up fragmenting our LLVM versions, if every package
previously using _latest is separately pinned to LLVM 14?", I hear you
ask.  No.  That fragmentation is already happening, even with an
llvmPackages_latest, because packages that actually require the
_latest_ version of LLVM (15/16), have already been decoupled from
llvmPackages_latest since it hasn't been upgraded.  So like it or not,
we can't escape packages depending on specific recent LLVMs.  The only
real fix is to get better at keeping the default LLVM up to
date (which I'm reasonably confident we're getting into a better
position to be feasibly better able to do).

So, unless we want to double down on providing a confusingly named
"llvmPackages_latest" attribute that refers to some arbitrary LLVM
version that's probably not the latest one (or even the latest one
available in Nixpkgs), we only have two options here: either we don't
provide such an attribute at all, or we don't use it in Nixpkgs so we
don't become scared to bump it as soon as we have a new LLVM available.
2023-05-08 13:05:33 +00:00
Mikaela Allan
445d7cae2a
nixos/config/swap: refactor startup script generation 2023-05-07 11:42:36 -04:00
Mikaela Allan
21b6bec0ff
nixos/config/swap: improve randomEncrytion
* add sector size parameter to swap randomEncryption
  * add key size parameter to swap randomEncryption
  * allow deviceName to be overridden for encrypted swap
  * create test for swap random encryption
  * update release notes
2023-05-05 13:36:42 -04:00
Sandro Jäckel
1b6078a24a
nixos/no-x-libs: add pipewire 2023-05-04 23:03:06 +02:00
Sandro Jäckel
ce0a2d2b85
nixos/no-x-libs: disable wayland for mpv 2023-04-30 02:23:41 +02:00
Will Fancher
e70b42bf61 systemd-initrd: Add users and groups with static IDs. 2023-04-12 13:55:50 -04:00
Jan Tojnar
5a3eb4f6fe nixos/users-groups: Fix password scheme validation
0d7cd66652 broke validation for hashes with options
such as those generated with `mkpasswd --method=sha-512 --rounds=1000000`:

    $6$rounds=1000000$xpzZ6Rfg873gZnDY$RxS7lpVnohfDrrKG3lt9UFHED1KoiPGzH7zQv/HzwalZepo/IfFtxw05ap25duEJSKYhC14.Fn9eXszEpWVtF.

This fixes it.
2023-04-03 02:16:07 +02:00
Robert Scott
9a6aabc474
Merge pull request #223548 from enc0urage/fix-graphene-hardened
nixos/malloc: set vm.max_map_count when using graphene-hardened
2023-03-29 22:32:24 +01:00
Garry Filakhtov
d86e9911cd
nixos/modules/config/resolvconf.nix: skip systemPackages if disabled
A change made in #166308 added `networking.resolvconf.package` to the
`environment.systemPackages` list, so it is installed as part of the
system image. However it does so unconditionally, meaning that even if
the `config.networking.resolvconf.enable` is set to false the package
listed in the `networking.resolvconf.package` would still be intalled.

This change makes it so the package installation will depend on the
status of the `config.networking.resolvconf.enable` option instead.
2023-03-29 09:31:09 +11:00
enc0urage
a76bd96e4b nixos/malloc: set vm.max_map_count when using graphene-hardened 2023-03-28 10:18:20 +00:00
github-actions[bot]
f2ead7fbda
Merge master into staging-next 2023-03-24 12:01:43 +00:00
Ryan Lahfa
a119bfc80d
Merge pull request #211603 from farcaller/fish
Assert that fish configuration is enabled if any user has fish as their shell
2023-03-24 12:05:22 +01:00
Vladimír Čunát
12dd95fbb1
Merge branch 'master' into staging-next 2023-03-24 09:07:41 +01:00
K900
c9a74cf40f nixos/fontconfig: time capsule 2023-03-23 22:03:35 +03:00
K900
8454084ffc nixos/hidpi: remove harder
We can't agree on what the right settings are (see #222236), so let's make the users choose.
2023-03-23 21:50:45 +03:00
github-actions[bot]
705ac3185e
Merge master into staging-next 2023-03-23 06:01:22 +00:00
Nick Cao
1285c0a09b
Merge pull request #222205 from NickCao/zram-writeback-device
nixos/zram: add writebackDevice option and corresponding test
2023-03-23 13:14:08 +08:00
github-actions[bot]
797a2b9bcc
Merge master into staging-next 2023-03-21 18:01:07 +00:00
K900
39c344c893 nixos/console: let the kernel pick the default font 2023-03-21 13:29:57 +01:00
K900
4787ebf7ae nixos/hidpi: remove
The single option tries to do too much work, which just ends up confusing people.

So:
- don't force the console font, the kernel can figure this out as of #210205
- don't force the systemd-boot mode, it's an awkward mode that's not supported
  on most things and will break flicker-free boot
- add a separate option for the xorg cursor scaling trick and move it under the xorg namespace
- add a general `fonts.optimizeForVeryHighDPI` option that explicitly says what it does
- alias the old option to that
- don't set any of those automatically in nixos-generate-config
2023-03-21 13:29:57 +01:00
Nick Cao
cd3ffbdfe6
nixos/zram: add writebackDevice option and corresponding test 2023-03-21 09:26:27 +08:00
github-actions[bot]
96f7385465
Merge master into staging-next 2023-03-20 00:02:29 +00:00
Ryan Lahfa
618ba94934
Merge pull request #210205 from 9ary/kernel-fonts
Build the large Terminus font into the kernel
2023-03-19 20:13:25 +01:00
Martin Weinelt
0d7cd66652
nixos/users-groups: Update password scheme validation
Updates the warnings message for statefully set up passwords, now that
weak algorithms have been removed from our libxcrypt package.

Additionall we now add proper validation for hashing schemes used in
`hashedPassword`.

Neither will prevent a rebuiild, but instead issue a warning, that this
requires immediate remediation, or else users will be unable to login.

Reuses the crypt scheme ids as provided by the libxcrypt package.
2023-03-13 07:54:27 +01:00
Artturin
2cbbef006b qt5: use makeScopeWithSplicing
if there is more than one qt5 attr and this file is copied then the arg
to generateSplicesForMkScope should be changed
2023-03-09 21:16:03 +02:00
Sandro
66ee57d44d
Merge pull request #217555 from SuperSandro2000/nox-qt5-no-self 2023-03-06 01:17:25 +01:00
Lily Foster
c56e5ef801 nixos/users-groups: update option description to clarify initial* option precedence 2023-02-25 14:27:35 -05:00
Lily Foster
bfa0bff644 nixos/update-users-groups: let hashedPassword take precedence over initialHashedPassword
Without this change, users that have both `initialHashedPassword` and
`hashedPassword` set will have `initialHashedPassword` take precedence,
but only for the first time `/etc/passwd` is generated. After that,
`hashedPassword` takes precedence. This is surprising behavior as it
would generally be expected for `hashedPassword` to win if both are set.

This wouldn't be a noticeable problem (and an assert could just be made
instead) if the users-groups module did not default the
`root.intialHashedPassword` value to `!`, to prevent login by default.
That means that users who set `root.hashedPassword` and use an ephemeral
rootfs (i.e. `/etc/passwd` is created every boot) are not able to log in
to the root account by default, unless they switch to a new generation
during the same boot (i.e. `/etc/passwd` already exists and
`hashedPassword` is used instead of `initialHashedPassword`) or they set
`root.initialHashedPassword = null` (which is unintuitive and seems
redundant).
2023-02-25 14:27:35 -05:00
Sandro Jäckel
a4f63a6e77
nixos/no-x-libs: hide qt5's self 2023-02-21 21:14:08 +01:00
Will Fancher
bb7cd63150
Merge pull request #215381 from lilyinstarlight/fix/make-initrd-ng-wrapped-executables
make-initrd-ng: support wrapped executables
2023-02-20 14:11:48 -05:00
Lily Foster
1fa1b58c25
nixos/console,nixos/systemd-initrd: remove now-unnecessary wrapped bin inclusions 2023-02-20 07:02:55 -05:00
Sandro
a366e69a12
Merge pull request #214815 from SFrijters/vim-no-x-libs
nixos/no-x-libs: add vim-full
2023-02-17 11:13:47 +01:00
Sandro Jäckel
9e3e928ad4
nixos/no-x-libs: fix infinite recursion with ffmpeg 2023-02-14 23:29:23 +01:00
pennae
bf4c0c1900 nixos/*: remove trailing period in mkEnableOptions
those are added by mkEnableOption, and .. is replaced to … by markdown
processing.
2023-02-08 15:23:34 +01:00
Nick Cao
341770d3f1
nixos/zram: fix default swapDevices 2023-02-07 09:16:16 +08:00
figsoda
a0231c119d
Merge pull request #214705 from Izorkin/update-noxlibs
nixos/no-x-libs: add mc
2023-02-06 09:43:57 -05:00
Florian Klink
5aa52365e7
Merge pull request #214103 from NickCao/zram
nixos/zram: use zram-generator
2023-02-06 12:53:19 +01:00