Commit Graph

12758 Commits

Author SHA1 Message Date
Frederik Rietdijk
7266f3ad2b Merge staging-next into staging 2019-12-15 16:12:48 +01:00
Christian Kampka
2387deec3d
postgresql-backup: Use saner defaults for pg_dump 2019-12-15 13:14:21 +01:00
Izorkin
2a413da57e nixos/nginx: do not run anything as root 2019-12-15 11:21:08 +03:00
Bernardo Meurer
5ee439eb08
nixos: fix ip46tables invocation in nat 2019-12-14 20:13:12 -08:00
Jan Tojnar
8dc5ff7dcf
nixos/displayManager: deprecate separate options for default wm/dm
The upstream session files display managers use have no concept of sessions being composed from
desktop manager and window manager. To be able to set upstream session files as default
session, we need a single option. Having two different ways to set default session would be confusing,
though, so we decided to deprecate the old method.

We also created separate script for each session, just like we already had a separate desktop
file for each one, and started using displayManager.sessionPackages mechanism to make the
session handling more uniform.
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner
53ef29c138
nixos/lightdm: enable wayland sessions
Note: can't launch gnome on wayland due to duplicate entry names:
  https://github.com/CanonicalLtd/lightdm/issues/16
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner
d25365c3c1
nixos/displayManager: introduce defaultSession
There's two ways of providing graphical sessions now:
- `displayManager.session` via. `desktopManager.session` and
  `windowManager.session`
- `displayManager.sessionPackages`

`sessionPackages` doesn't make a distinction between desktop and window
managers. This makes selecting a session provided by a package using
`desktopManager.default` nonsensical.

We therefor introduce `displayManager.defaultSession` which can select a session
from either `displayManager.session` or `displayManager.sessionPackages`.

It will default to `desktopManager.default + windowManager.default` as before.
If the dm default is "none" it will select the first provided session from
`sessionPackages`.
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner
58e5290fce
nixos/displayManager: check for provided sessions in mkDesktops 2019-12-15 04:16:20 +01:00
Tor Hedin Brønner
dd7144b860
nixos/sessionPackages: provide session names in passthru
We want access to the valid session names at evaluation time.
2019-12-15 04:16:18 +01:00
Tor Hedin Brønner
d362df6682
nixos/display-manager: extraSessionFilePackages -> sessionPackages 2019-12-15 04:14:56 +01:00
Jan Tojnar
aa3cb8b00e
Merge branch 'staging-next' into staging 2019-12-14 23:09:23 +01:00
Léo Gaspard
226ea5c17a
Merge pull request #75294 from kampka/postgres-service-refactor
matrix-synapse: Use postgres service to create database and user
2019-12-14 21:36:59 +01:00
WilliButz
10c5b2d91c
Merge pull request #75363 from primeos/sway-display-manager-integration
nixos/sway: Enable the display manager integration
2019-12-14 17:02:33 +01:00
Florian Klink
2a38b91cc4
Merge pull request #75384 from Izorkin/nginx-unit
nixos/unit: enable sanboxing
2019-12-14 16:16:50 +01:00
mt_caret
7358e4f93c nixos/lxd: add recommendedSysctlSettings
* nixos/lxd: add productionSetup option
* nixos/lxd: enable some settings by default
* nixos/lxd: rename option
2019-12-14 15:29:08 +01:00
Samuel Dionne-Riel
f8ab1a9c17
Merge pull request #75592 from lovesegfault/ext4-fs-compression
nixos: compress make-ext4-fs with zstd
2019-12-13 21:42:34 -05:00
Bernardo Meurer
70c5a78062
nixos: compress make-ext4-fs with zstd 2019-12-13 16:18:04 -08:00
worldofpeace
557f93dd96
Merge pull request #75558 from worldofpeace/pantheon-show-manual-login
nixos/lightdm-greeters/pantheon: show manual login card
2019-12-13 18:59:46 -05:00
worldofpeace
f5081ecca6 networkmanagerapplet: default to withGnome
This requires us to add gcr to the module.
2019-12-13 18:23:20 -05:00
Christian Kampka
b2d67c08d0
matrix-synapse: Use postgres service to create database and user 2019-12-13 21:22:27 +01:00
Christian Kampka
b85286fe66 postgresql: Quote role names when creating database users 2019-12-13 14:10:18 -06:00
Silvan Mosberger
89eccbf985
Merge pull request #71052 from turboMaCk/imwheel-service
services.xserver.imwheel: add module
2019-12-13 19:37:59 +01:00
Marek Fajkus
7406c0af98
services.xserver.imwheel: add module 2019-12-13 18:19:29 +01:00
volth
018c0445ba nixos/unbound: add package option 2019-12-12 23:49:47 +00:00
WilliButz
727f2e9a3e
nixos/oxidized: specify PID file in service 2019-12-12 23:19:07 +01:00
Kai Wohlfahrt
b1c10bc8b2 nfs: set up request-key for id mapping
A patch is necessary upstream to support multiple configs via symlinks
in /etc/request-key.d

Once that is done, we can add support for CIFS as well
2019-12-12 15:42:44 +00:00
Izorkin
e1e0059667 nixos/unit: update preStart script 2019-12-12 17:59:10 +03:00
Izorkin
7443d9dfd4 nixos/unit: enable sanboxing 2019-12-12 17:59:10 +03:00
Andreas Rammhold
e8bb94fca9
Merge pull request #68459 from volth/patch-364
nixos/nat: create nixos-nat-{pre,post,out} in ip6tables too
2019-12-12 15:55:51 +01:00
worldofpeace
a24004fa38 nixos/lightdm-greeters/pantheon: show manual login card
I find this important to be default on for users in https://github.com/elementary/greeter/issues/394
2019-12-12 07:22:37 -05:00
wucke13
93696e3c1f nixos/bacula-sd: add autochange support
+ Fixing interrupted descriptions
+ Added more verbose descriptions
+ Addded <literal> to the descriptions
+ uniformly reformated descriptions to break at 80 chars

(cherry picked from commit c7945c8a97df52a468cf32155154cdec021561bc)
2019-12-11 19:16:50 +01:00
worldofpeace
d3a9b098d5
Merge pull request #75489 from hedning/gdm-only-default-with-auto
nixos/gdm: only set session on auto login
2019-12-11 08:41:46 -05:00
Tor Hedin Brønner
d04157fb98 nixos/gdm: do not force the session
Having a default session resulted in GDM not remembering the last used
session.

So do not force the session until setSessionScript is made aware of the
last session used.
2019-12-11 13:50:18 +01:00
Domen Kožar
17d1925608
Merge pull request #75484 from raboof/74944-timestamps-leak-into-minimal-image
installer/cd-dvd/iso-image: avoid leaking build timestamps
2019-12-11 09:42:06 +01:00
Arnout Engelen
88ee3b021d installer/cd-dvd/iso-image: avoid leaking build timestamps
When 'grafting' '/nix/store/<hash>-loopback.cfg' from disk onto
'/boot/grub/loopback.cfg' on the iso, the parent 'grub' directory does not
exist yet. In this case it is automatically created and inherits its
attributes, including timestamp, from /nix/store.

This is correct/expected/intentional behavior of xorriso, but has the
undesired result of leaking the timestamps of /nix/store into the iso. For
this reason we put the loopback.cfg in a
'/nix/store/<hash>-loopback.cfg/grub/loopback.cfg' instead, so it will inherit
the attributes from the correctly-timestamped
'/nix/store/<hash>-loopback.cfg/grub' directory.

For the same reason we move '/EFI/boot/efi-background.png' down in the list
so it is grafted after its parent '/EFI/boot' directory is created with
the correct timestamp.

fixes #74944
2019-12-11 09:07:40 +01:00
worldofpeace
c158ad48c5 nixos/oblogout: drop module 2019-12-10 22:41:25 -05:00
worldofpeace
50295a1201
Merge pull request #75343 from worldofpeace/polkit-no-root-admin
nixos/polkit: remove root from adminIdentities
2019-12-10 20:24:23 -05:00
gnidorah
cc54e5a685 nixos/mame: init 2019-12-10 19:53:43 +03:00
worldofpeace
4745d20734
nixos/transmission: don't use types.str 2019-12-09 23:31:38 -05:00
Silvan Mosberger
4ee3e8b21d
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because:
- It breaks disabledModules for modules that have a rename defined
- Adding/removing renames for a module means having to find them in the
central file
- Merge conflicts due to multiple people editing the central file
2019-12-10 02:51:19 +01:00
worldofpeace
efc1c027ad nixos/polkit: remove root from adminIdentities
Fixes https://github.com/NixOS/nixpkgs/issues/75075.

To summarize the report in the aforementioned issue, at a glance,
it's a different default than what upstream polkit has. Apparently
for 8+ years polkit defaults admin identities as members of
the wheel group [0]. This assumption would be appropriate on NixOS, where
every member of group 'wheel' is necessarily privileged.

[0]: 763faf434b
2019-12-09 19:11:09 -05:00
Michael Weiss
ca9788d4de
nixos/sway: Enable the display manager integration
If no display manager is enabled this will not make any difference, but
if a Wayland compatible display manager like SDDM is enabled, a session
for Sway will be available. Therefore it does make sense to enable this
by default.

This adds the display manager integration mentioned in #57602.
2019-12-09 14:18:03 +01:00
worldofpeace
8783acb0bd nixos/pantheon: use GTK3_MODULES
Fixes https://github.com/NixOS/nixpkgs/issues/75244

See also https://github.com/elementary/default-settings/pull/150.
2019-12-08 19:41:12 -05:00
Renaud
f640cf49d1
rdf4store: remove pkg and service modules
(#74214)
2019-12-08 20:33:51 +01:00
Davíð Steinn Geirsson
077934e192 transmission: Configurable download directory permissions
Allow the user to specify the permissions to apply to download folders
used by transmission. This is useful e.g. when they are stored on a
network share and accessed by other users.

This commit also makes the home and config directories 700, as there
is should be no need for wider permissions there.
2019-12-08 16:33:19 +01:00
Aaron Andersen
9abf0a1664
Merge pull request #75182 from clefru/typofix
apache-kafka.nix: Add missing quote inside tmpfiles rule
2019-12-07 22:50:50 -05:00
Maximilian Bosch
ff65638bfc
nixos/networkd: only set gateway if it's explicitly specified in the module system 2019-12-08 03:30:04 +01:00
Clemens Fruhwirth
39cd4574aa apache-kafka.nix: Add missing quote inside tmpfiles rule 2019-12-07 23:59:10 +01:00
Janne Heß
d21f5cf36f nixos/nextcloud: Do not run sudo if not needed
Only use sudo if we are currently not running as the nextcloud user.
This is problematic when occ is called from a systemd service with
NoNewPrivileges=true
2019-12-07 21:10:34 +01:00
Emery Hemingway
6c1c99d6b4 nixos/yggdrasil: fix for configFile option
The configFile was not being merged with the declarative configuration at
runtime.
2019-12-07 19:56:49 +01:00
Jan Tojnar
36de08ebe1
Merge pull request #71442 from jtojnar/ibus-fixes
Fix/clean up various ibus-engines
2019-12-07 12:10:44 +01:00
Jan Tojnar
175359cfac
nixos/ibus: install D-Bus services
IBus contains some D-Bus services, we should install them too. And enable dconf properly.
2019-12-07 00:58:30 +01:00
Vanya Klimenko
125205cd60
nixos/apache-httpd: fix typo in extraConfig description 2019-12-06 21:47:15 +03:00
Maximilian Bosch
4324419f9e
Merge pull request #72888 from fooker/pr-3
nixos/networkd: Add more valid values for RequiredForOnline
2019-12-06 18:04:34 +01:00
Florian Klink
2c1281eb7a nixos/networkd: add missing "Advertise" option
This is in systemd since v240.
2019-12-06 08:43:34 +01:00
Florian Klink
77f26cc542
Merge pull request #74852 from srhb/gitea-fix-start
nixos/gitea: Fix startup
2019-12-05 22:56:46 +01:00
Florian Klink
ea9c3b9342
Merge pull request #74032 from ckauhaus/remove-networking.hostconf
Remove networking.hostConf option
2019-12-05 21:42:33 +01:00
Silvan Mosberger
89b1bd1b92
Merge pull request #72734 from nyanloutre/zfs_zed_config_module
nixos/zfs: ZED config module
2019-12-05 07:15:39 +01:00
worldofpeace
b12aef05a4
Merge pull request #73968 from mat8913/upower-config-master
nixos/upower: Allow customization of UPower.conf
2019-12-05 05:25:00 +00:00
Maximilian Bosch
03ad033f97
Merge pull request #74992 from rnhmjoj/maintainers
nixos: add myself to maintainers
2019-12-04 21:09:48 +01:00
nyanloutre
c082e13ecb
nixos/zfs: Adding ZED configuration options
Co-authored-by: sjau <github.com@sjau.ch>
2019-12-04 20:29:19 +01:00
Jason Samsa
7e564ae162 remove vulgarity from wordpress nixos module 2019-12-04 12:45:40 -06:00
rnhmjoj
1a2e7c3b00
nixos: add myself to maintainers 2019-12-04 17:09:53 +01:00
Matthew Harm Bekkema
f83a83f964 upower: load config from /etc
In the process of making UPower.conf customizable (#73968), it came up
that UPower doesn't load its config from /etc by default.

The UPower derivation is modified to make it load its config from /etc
at runtime, but still install the default config to its nix store path
as before.

The UPower module is modified to put the config in /etc.
2019-12-04 12:26:30 +11:00
Matthew Harm Bekkema
aecfea098e nixos/upower: Allow customization of UPower.conf
Documentation of options and default values taken from the upstream
UPower.conf. The documentation was modified slightly to make more sense
when displayed on https://nixos.org/nixos/options.html.

A copy of upstream UPower.conf can be found here:
https://cgit.freedesktop.org/upower/tree/etc/UPower.conf?id=28bd86c181e2510ef6a1dc7cfa26f97803698a79
2019-12-04 12:26:30 +11:00
Florian Klink
49f3d9203a
Merge pull request #74913 from paumr/master
improved nginx.basicAuthFile description
2019-12-04 01:03:45 +01:00
Eelco Dolstra
56588e9eaa
Merge pull request #74850 from davidak/PRETTY_NAME
nixos/version: PRETTY_NAME in /etc/os-release uses the release now
2019-12-03 15:08:52 +01:00
paumr
5a1c15da12 improved nginx.basicAuthFile description 2019-12-03 14:05:46 +01:00
Mario Rodas
93ff0446ca
Merge pull request #66089 from servalcatty/v2ray
v2ray: init at 4.21.3
2019-12-03 04:42:50 -05:00
Sarah Brofeldt
218fe53e24 nixos/gitea: Add srhb as maintainer 2019-12-02 21:45:06 +01:00
Sarah Brofeldt
1573102a89 nixos/gitea: Fix startup 2019-12-02 21:45:06 +01:00
davidak
0ba3761ba8 nixos/version: PRETTY_NAME in /etc/os-release uses the release now instead of full version
to be more suitable for presentation to the user
2019-12-02 20:04:44 +01:00
worldofpeace
5350db96e2
Merge pull request #74838 from jtojnar/pantheon-debug
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
2019-12-02 18:05:41 +00:00
Jan Tojnar
9129616919
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
When session debugging was enabled in GNOME but not in Pantheon

	{
	  services.xserver = {
	    desktopManager.pantheon = {
	      enable = true;
	    };
	    desktopManager.gnome3 = {
	      enable = true;
	      debug = true;
	    };
	  };
	}

it caused a conflict:

	error: The option `environment.sessionVariables.GNOME_SESSION_DEBUG' has conflicting definitions, in `<nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix>' and `<nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix>'.
2019-12-02 17:25:24 +01:00
worldofpeace
15951cba08
Merge pull request #63607 from rnhmjoj/remove-obex
nixos/bluetooth: don't install obex tools by default
2019-12-01 22:50:47 +00:00
rnhmjoj
40d4c3c93e
nixos/plasma5: install obex tools when bluetooth is enabled 2019-12-01 22:52:58 +01:00
Janne Heß
e42036ee0e nixos/gitea: Sandbox the systemd service 2019-12-01 10:18:48 +01:00
Jan Tojnar
32b8c88ce4
Revert "environment.noXlibs: do not pull gobject-introspection"
gobject-introspection has nothing to do with graphical systems or GNOME, it is needed for language bindings like Python.

This reverts commit d757135c05
2019-12-01 02:16:04 +01:00
Jan Tojnar
8cbc862b83
dconf: move to top-level 2019-12-01 01:01:40 +01:00
Matthew Bauer
f97746ba27
Merge pull request #74715 from baloo/baloo/no-x-libs/polkit
environment.noXlibs: do not pull gobject-introspection
2019-11-30 13:32:29 -06:00
Domen Kožar
0f799bd8a4
Revert "nixos/switch-to-configuration: restart changed socket units"
This reverts commit 89806e9536.

See #74626
2019-11-30 13:46:57 +01:00
Arthur Gautier
d757135c05 environment.noXlibs: do not pull gobject-introspection 2019-11-29 16:57:45 -08:00
Alex Guzman
752b8688b5 nixos/roon-server: fix broken user generation
Didn't notice this till I tried removing my custom roon user from the one I was testing with. There's not a 'groups' option for users, only group (primary group) and extraGroups. Use these.
 (#68337)
2019-11-29 23:50:10 +01:00
rnhmjoj
1598f3d257
nixos/bluetooth: don't install obex tools by default 2019-11-29 21:08:58 +01:00
Renaud
e37e7b413c
Merge pull request #72987 from rnhmjoj/dnschain
nixos/dnschain: use forwardZonesRecurse in pdns-recursor
2019-11-29 19:56:21 +01:00
Christian Kauhaus
918c2ca01a Remove networking.hostConf option
This PR is part of the networking.* namespace cleanup. We feel that
networking.hostConf is rarely used and provides little value compared to
using environment.etc."host.conf" directly.

Provide sensible default: multi on
2019-11-29 12:08:34 +01:00
Florian Klink
4e8c2f08b0
Merge pull request #74048 from ckauhaus/ssmtp-named-ssmtp
ssmtp: use services.ssmtp not networking.defaultMailServer
2019-11-28 16:32:50 +01:00
Andreas Rammhold
3c6a33e049
Merge pull request #74177 from jtojnar/neard
nixos/neard: init
2019-11-28 07:53:32 +01:00
Aaron Andersen
5988940ca7
Merge pull request #73577 from helsinki-systems/matomo-consistency
matomo: Fix consistency check
2019-11-27 18:07:20 -05:00
Aaron Andersen
a568a03674
Merge pull request #73872 from filalex77/modules/services/hardware/bluetooth/ini-generator
nixos/bluetooth: add support for INI generator
2019-11-27 18:02:20 -05:00
Serval
899d38170c
v2ray: fixups and change to buildGoModule 2019-11-28 02:10:37 +08:00
misuzu
823d6698bb nixos/3proxy: note about htpasswd 2019-11-27 11:01:48 +02:00
worldofpeace
1b5df99e7a
Merge pull request #70295 from worldofpeace/mutter-eglstreams
Mutter eglstreams
2019-11-27 05:29:58 +00:00
Dima
0541d071af samba3, fusesmb: removing
Samba 3 has been discontinued since Q1/2015. So I think it's time
to just wipe it from the pkgs. FuseSMB is pretty much abandoned,
upstream does not exist and it's also not as useful as it used to
be anyways.
2019-11-26 19:56:16 +01:00
Robin Gloster
83b14e578f
Merge pull request #74198 from WilliButz/fix/nginx-exporter-startup
nixos/prometheus-exporters: fix nginx exporter startup
2019-11-26 17:37:23 +01:00
Robin Gloster
c33110db9e
Merge pull request #73299 from toonn/wpa_supplicant-unit-start-bonding
nixos/wpa_supplicant: fix unit-start script
2019-11-26 16:48:48 +01:00
worldofpeace
ebce2e0c68
Merge pull request #72584 from andir/homeInPath-false
nixos: default `environment.homeBinInPath` to false
2019-11-26 12:33:22 +00:00
Domen Kožar
634096c503
Merge pull request #73871 from mayflower/socket-activation-fix
nixos/switch-to-configuration: restart changed socket units
2019-11-26 13:28:48 +01:00
Andreas Rammhold
a06529b7ad
nixos: default environment.homeBinInPath to false
This is a more sane default since we do not magically (without opt-in)
pull in binaries from `~/bin`. That is not really an expected behavior
for many users. Users that still want that behavior can now just flip
that switch.
2019-11-26 12:44:12 +01:00
Christian Kauhaus
dd87e9eb4d ssmtp: use services.ssmtp.* options
This PR is part of the networking.* namespace cleanup.

ssmtp used to be configured via `networking.defaultMailServer` which is
sort of misleading since it provides options only for ssmtp. Other
dumb mail relays like nullmailer have always been living under
services.

The intent of this PR is to align ssmtp's options with those of similar
services. Specifically, two renames have been done:

* Rename `networking.defaultMailHost` to `services.ssmtp`.
* Rename `directDelivery` to `enable` because this is what it basically does.
2019-11-26 11:08:44 +01:00