3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

864 commits

Author SHA1 Message Date
Alyssa Ross 262447705c nixos/ssh: add programs.ssh.knownHostsFiles option
The programs.ssh.knownHosts.*.publicKeyFile is broken, because it's
scoped to a set of host names, but to insert those host names on each
line of the file we'd have to parse out blank lines and comments, so
only the first line works.  It would be much easier all round if users
just provided known hosts files in the normal format, and we pointed
ssh directly to them.  This way, it would be possible to have multiple
keys for a single host (which is extremely common due to multiple
algorithms being commonplace).

We add an option for this instead of relying on extraConfig, because
we need to make sure /etc/ssh/ssh_known_hosts is always included to
ensure programs.ssh.knownHosts keeps working.
/etc/ssh/ssh_known_hosts2 is another OpenSSH default that seems a bit
weird, but there's no real reason to change that so we'll leave it.
2022-01-11 20:02:26 +00:00
Robert Hensing 70d27303da
Merge pull request #149532 from pennae/split-docs-build
nixos/*: split docs build
2022-01-04 22:33:23 +01:00
pennae 1301bdb185 nixos/make-options-doc: turn relatedPackages into links
link to search.nixos.org instead of pulling package metadata out of pkgs. this
lets us cache docs of a few more modules and provides easier access to package
info from the HTML manual, but makes the manpage slightly less useful since
package description are no longer rendered.
2022-01-02 19:46:13 +01:00
pennae fc614c37c6 nixos/documentation: split options doc build
most modules can be evaluated for their documentation in a very
restricted environment that doesn't include all of nixpkgs. this
evaluation can then be cached and reused for subsequent builds, merging
only documentation that has changed into the cached set. since nixos
ships with a large number of modules of which only a few are used in any
given config this can save evaluation a huge percentage of nixos
options available in any given config.

in tests of this caching, despite having to copy most of nixos/, saves
about 80% of the time needed to build the system manual, or about two
second on the machine used for testing. build time for a full system
config shrank from 9.4s to 7.4s, while turning documentation off
entirely shortened the build to 7.1s.
2022-01-02 19:46:13 +01:00
Aidan Gauland 82dd41e74d firejail: clarify wrappedBinaries option description
I had trouble getting programs.firejail.wrappedBinaries to have any effect on my
system (#152852), because I did not realise that "put[ting] the actual
application binary in the global environment" included adding the program
package to environment.systemPackages, and I thought that the package must be
present for this option to take effect.  I have added a clarifying parenthetical
statement explicitly mentioning environment.systemPackages in this caveat.
2022-01-01 18:13:21 +13:00
José Romildo 44c1dfb32d qt5ct: move to qt5-packages 2021-12-27 11:03:07 -03:00
Andrew Marshall f10aea2434 nixos/ssh: Add enableAskPassword
Previously, this was only implicitly enabled if xserver.enable = true.
However, Wayland-based desktops do not require this, and so configuring
SSH_ASKPASS on a Wayland desktop becomes cumbersome. This simplifies
that by adding a new option that defaults to the old conditional.
2021-12-18 12:13:02 -05:00
Graham Christensen 06edb74413
Merge pull request #148785 from pennae/more-option-doc-staticizing
treewide: more defaultText for options
2021-12-17 11:14:08 -05:00
pennae 1f960e7571 nixos/captive-browser: add defaultText for browser
easiest way to do this is to move the default expression out and
abstract over what is substituted into it, using a dependent value for
the default and a descriptive value for defaultText
2021-12-09 01:42:24 +01:00
pennae 2d564521c0 treewide: add literalDocBook text to options with complex defaults
some options have default that are best described in prose, such as
defaults that depend on the system stateVersion, defaults that are
derivations specific to the surrounding context, or those where the
expression is much longer and harder to understand than a simple text
snippet.
2021-12-09 01:38:24 +01:00
pennae e24a8775a8 treewide: set defaultText for options using simple path defaults
adds defaultText for all options that set their default to a path expression
using the ubiquitous `cfg` shortcut bindings.
2021-12-09 01:12:13 +01:00
Jan Tojnar bcb4b714bd Revert "nixos: make GIO_EXTRA_MODULES a session variable"
This reverts commit abfcb79abf.

Fixes: https://github.com/NixOS/nixpkgs/issues/149539
2021-12-08 19:54:18 +01:00
Jan Tojnar 75eaab3757
Merge pull request #126832 from ncfavier/gio-extra-modules
nixos: make GIO_EXTRA_MODULES a session variable
2021-12-06 16:23:48 +01:00
Dominique Martinet efe6967e93 bcc: move from linux-kernels packages to normal packages
bcc doesn't really need kernel itself, it just cares about module path.

It's actually better to use /run/booted-system/kernel-modules/lib/modules
for two reasons:
 - no need to rebuild bcc for each new kernel
 - can use a newer bcc with a booted kernel that doesn't match the current
   system
2021-12-04 21:07:09 +09:00
Sandro fef107d5a5
Merge pull request #142839 from ivan/zsh-autosuggestions-config-async 2021-11-25 00:09:18 +01:00
Patrick Hilhorst 5a14b59cd7
Merge pull request #122995 from primeos/sway-install-default-wallpaper 2021-11-21 21:57:49 +01:00
Ivan Kozik b897f5fe70 nixos/autosuggestions: add config to control whether suggestions are async
zsh-autosuggestions now defaults to asynchronous suggestions, but they can
be annoying when they take several frames longer to show up after typing.
2021-11-19 01:09:44 +00:00
Sandro 6f0ff67bb0
Merge pull request #135026 from ckiee/cnping 2021-11-15 11:35:59 +01:00
Andreas Fuchs 8a37d710fd nixos: zsh: Remove hack for zsh-nix-completions on nix 2.4
The zsh-nix-completions package now sets a priority, which helps avoid
conflicts with newer nix versions without patching the package from
the module.
2021-11-14 22:09:01 +01:00
Thiago Kenji Okada b142bd35d5 nixos/neovim: fix withRuby, add with{Python3,NodeJs}
`withRuby` was declared but not referenced before, this commit fixes
this issue.

It also adds support for `withPython3` and `withNodeJs`.
2021-11-07 19:40:07 +01:00
Christian Kögler 6c0804f1b0 nixos/neovim: Respect option defaultEditor 2021-10-28 18:51:44 +02:00
Bobby Rong d34be69054
nixos/file-roller: add option for specify package 2021-10-22 10:26:27 +08:00
Maciej Krüger f7881666bf
Merge pull request #141555 from figsoda/git-attrsof-anything 2021-10-18 10:44:35 +02:00
Bobby Rong ce7479ef91
nixos/evince: add option for specify package 2021-10-17 11:42:22 +08:00
figsoda 471cfaf523 nixos/git: change config type 2021-10-16 22:39:56 -04:00
ckie 2ba28b7226
nixos/cnping: init 2021-10-14 21:27:38 +03:00
Maciej Krüger c84b55bbe6
nixos/git: add lfs option to allow enabling and installing lfs easily
Co-authored-by: figsoda <figsoda@pm.me>
2021-10-11 17:56:33 +02:00
Michele Guerini Rocco e99b3f242c
Merge pull request #140359 from rnhmjoj/setgid-nobody
nixos: make setgid wrappers root-owned
2021-10-06 08:36:35 +02:00
Eelco Dolstra f18bf9b9f1
Merge pull request #140519 from lovesegfault/no-auto-install
command-not-found: remove NIX_AUTO_INSTALL
2021-10-05 11:15:47 +02:00
Matt McHenry a2a0a58f7c
less: improve default settings (#139988)
* less: enable by default and set LESS=-R via lesskey

* since we set PAGER=less, programs.less.enable should default to
  true.

* some programs, notably git, set a custom LESS environment if none is
  present.  using the lesskey mechanism to set LESS=-R lets such
  programs continue to run less as they see fit.

This reverts commit 0e7b4e60a8.

* less: remove use of deprecated lesskey binary format

* less: enable in environment.nix rather than less.nix

per discussion in #139988
2021-10-05 11:13:48 +02:00
Maciej Krüger 20eeb1e09e
Merge pull request #138811 from mkg20001/htop 2021-10-05 06:33:40 +02:00
Maciej Krüger a425421e28
nixos/htop: add module
This module allows setting global configuration for htop in /etc/htoprc,

for example to disable showing userland threads by default

Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2021-10-05 06:00:43 +02:00
Bernardo Meurer c301c1995e
command-not-found: remove NIX_AUTO_INSTALL 2021-10-04 12:43:39 -07:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
rnhmjoj 31790c81dc
nixos: make setgid wrappers root-owned 2021-10-03 11:44:57 +02:00
Erik Arvstedt a807cd3a00
nixos/extra-container: init 2021-09-30 22:52:14 +02:00
Vladimír Čunát 8be5516756
Merge #138918: Fix several NixOS errors in Hydra evaluation
In particular, this should unblock the trunk-combined jobset.
2021-09-22 17:28:37 +02:00
rnhmjoj 22d05f8fa2
nixos/plotinus: fix evaluation
Apparently setting a variable via `environment.variables` when the same
is already present in `environment.sessionVariables` (that is merged
into the former option) creates a conflict.

For reference: this started with the change in #101274.
2021-09-22 15:53:29 +02:00
rnhmjoj b53a5b91b9
nixos/atop: fix broken wrapper
The setuid,owner,group options are mandatory after #126289.
2021-09-22 12:38:19 +02:00
Sandro f18f2d87f3
Merge pull request #135284 from legendofmiracles/weylus 2021-09-21 22:04:38 +02:00
davidak a0d68379c2
Merge pull request #138428 from bobby285271/pantheon-tweaks
pantheon-tweaks: init at 1.0.1
2021-09-19 02:47:37 +02:00
Bobby Rong f126efd820
nixos/pantheon-tweaks: init 2021-09-18 22:49:53 +08:00
rnhmjoj fedd7cd690
nixos: explicitely set security.wrappers ownership
This is slightly more verbose and inconvenient, but it forces you
to think about what the wrapper ownership and permissions will be.
2021-09-13 13:48:13 +02:00
rnhmjoj 8f76a6eefc
nixos: add implict security.wrappers options
This is to keep the same permissions/setuid/setgid as before the change
in security.wrappers defaults.
2021-09-13 13:48:13 +02:00
figsoda 44853e8cf3 nixos/git: init 2021-09-10 18:50:04 -04:00
Robert Hensing e16c267e48
Merge pull request #128916 from heisenberg33/patch-4
Fix default pager environment
2021-09-07 12:45:36 +02:00
Anders Kaseorg d8ef13fc13 modules/programs/command-not-found: Fix ShellCheck warnings
https://github.com/koalaman/shellcheck/wiki/SC2086
Double quote to prevent globbing and word splitting.

https://github.com/koalaman/shellcheck/wiki/SC2166
Prefer `[ p ] && [ q ]` as `[ p -a q ]` is not well defined.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-09-06 08:49:34 +09:00
Anders Kaseorg d44b6ae6cb modules/programs/bash: Fix ShellCheck warnings
https://github.com/koalaman/shellcheck/wiki/SC2086
Double quote to prevent globbing and word splitting.

https://github.com/koalaman/shellcheck/wiki/SC2166
Prefer `[ p ] && [ q ]` as `[ p -a q ]` is not well defined.

https://github.com/koalaman/shellcheck/wiki/SC2219
Instead of `let expr`, prefer `(( expr ))` .

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-09-06 08:49:34 +09:00
legendofmiracles 5258463721
nixos/weylus: init 2021-09-02 06:33:23 -06:00
davidak 10d21c60e7
Merge pull request #131695 from tomfitzhenry/calls
programs/calls: init
2021-08-26 04:44:01 +02:00