Aaron Andersen 620e154921 Merge pull request #94043 from aanderse/zabbix-settings ... nixos/zabbix*: replace extraConfig option with settings option		2020-08-04 12:49:43 -04:00
..
config	Merge branch 'master' into staging-next	2020-07-22 08:37:19 +02:00
hardware	treewide: fix typo on word environment	2020-07-28 08:00:38 +02:00
i18n/input-method	ibus: fix installation of dconf database	2020-06-02 22:32:03 +02:00
installer	Merge pull request #88669 from Mic92/hidpi	2020-07-22 17:43:03 +02:00
misc	nixos/zigbee2mqtt: init	2020-07-20 21:48:14 +02:00
profiles	nixos/displayManager: make autoLogin options independent of DM type	2020-07-09 21:15:35 -04:00
programs	nixos/steam: init	2020-07-30 20:23:57 +02:00
security	pam_p11: add	2020-07-25 09:37:48 +02:00
services	Merge pull request #94043 from aanderse/zabbix-settings	2020-08-04 12:49:43 -04:00
system	initrd-network: fix flushBeforeStage2	2020-08-02 09:00:11 +02:00
tasks	nixos/boot: some documentation improvements	2020-07-29 14:39:21 -07:00
testing
virtualisation	Merge pull request #60246 from dfordivam/virtualbox-add-extra-disk	2020-08-02 13:13:52 -04:00
module-list.nix	Merge pull request #92468 from petabyteboy/jitsi-meet	2020-08-03 12:43:37 -07:00
rename.nix	nixos/displayManager: make autoLogin options independent of DM type	2020-07-09 21:15:35 -04:00