about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2019-09-24Merge branch 'staging-next' into stagingVladimír Čunát14-27/+50
2019-09-24Merge branch 'master' into staging-nextVladimír Čunát14-27/+50
2019-09-24Merge pull request #68946 from volth/escapeJörg Thalheim7-13/+13
2019-09-24Merge pull request #67748 from typetetris/yubico-local-authJörg Thalheim1-1/+18
2019-09-23nixos/postgresql-wal-receiver: remove restart limit (#67857)Notkea1-1/+2
2019-09-23Merge pull request #68970 from teto/rngdRobin Gloster1-2/+2
2019-09-23nixos/systemd: pick more upstream tmpfiles confsFranz Pletz2-7/+5
2019-09-23nixos/gitlab: Add gnutar and gzip to gitlab-sidekiq's path (#68908)Florian Klink1-0/+4
2019-09-23Merge pull request #69260 from volth/patch-369Peter Hoeg1-1/+2
2019-09-23Merge pull request #15560 from peterhoeg/nm_dnsdhcpPeter Hoeg1-2/+4
2019-09-22nixos/mailcatcher: add bind capabilitiesvolth1-1/+2
2019-09-22Merge branch 'staging-next' into stagingJan Tojnar3-15/+20
2019-09-22Merge branch 'master' into staging-nextJan Tojnar3-15/+20
2019-09-22nixos/wordpress: generate secrets locallyMartin Milata2-14/+19
2019-09-22Merge pull request #68950 from peti/t/nixos-doc-fixPeter Simons1-1/+1
2019-09-22Enable work variant firewall with iptables-compat (#66953)Jörg Thalheim1-2/+13
2019-09-22nixos/firewall: rename iptables-compat to iptables-nftables-compatJörg Thalheim1-1/+2
2019-09-22Merge branch 'staging-next' into stagingVladimír Čunát4-1/+109
2019-09-22Re-Revert "Merge branch 'staging-next'"Vladimír Čunát1-0/+5
2019-09-22nixos/networkmanager: tiny cleanupsPeter Hoeg1-2/+4
2019-09-21nixos/spotifyd: update spotifyd flagsMario Rodas1-1/+1
2019-09-21Revert "Merge branch 'staging-next'"Vladimír Čunát1-5/+0
2019-09-21Add cri-o service to modules (#68153)Sascha Grunert2-0/+107
2019-09-21Merge branch 'staging-next'Vladimír Čunát1-0/+5
2019-09-21Merge pull request #69195 from c0deaddict/fix/gitea-dumpElis Hirwing1-0/+1
2019-09-21nixos/gitea: fix dumpJos van Bakel1-0/+1
2019-09-20Merge remote-tracking branch 'origin/master' into stagingMatthew Bauer127-1901/+5680
2019-09-20sdImage: use findmnt to get root device when resizing (#58059)Silvan Mosberger1-1/+3
2019-09-19Merge pull request #68983 from worldofpeace/xfce-cleanupworldofpeace1-5/+11
2019-09-19Revert "nixos/doc: re-format"Eelco Dolstra124-1894/+5663
2019-09-19Merge pull request #69093 from alexarice/xterm-defaultworldofpeace1-1/+3
2019-09-19Merge staging-next into stagingFrederik Rietdijk4-12/+31
2019-09-19Merge master into staging-nextFrederik Rietdijk4-12/+31
2019-09-19Merge pull request #68906 from edolstra/revert-interface-versionEelco Dolstra1-6/+13
2019-09-19xterm: Set default to xserver.enableAlex Rice1-1/+3
2019-09-19nixos/jormungandr: moving to a new section topics_of_interestMarek Mahut1-2/+4
2019-09-18Merge pull request #69031 from worldofpeace/xcursor-updateworldofpeace2-4/+14
2019-09-18Merge branch 'staging-next' into stagingJan Tojnar126-5665/+1895
2019-09-18Merge branch 'master' into staging-nextJan Tojnar126-5665/+1895
2019-09-18doc: Disable wrapping source (#68181)Jan Tojnar125-5664/+1894
2019-09-18nixos/doc: re-formatJan Tojnar124-5663/+1894
2019-09-18nixos/sway: install swaybg by defaultMaximilian Bosch1-1/+1
2019-09-18doc: Disable wrapping sourceJan Tojnar1-1/+0
2019-09-18Merge branch 'staging-next' into stagingJan Tojnar28-142/+357
2019-09-18Merge branch 'master' into staging-nextJan Tojnar28-142/+357
2019-09-18nixos/xdg/icons: match XCURSOR_PATH specworldofpeace2-4/+14
2019-09-18Merge pull request #68729 from worldofpeace/elementary-greeter/masterworldofpeace2-21/+9
2019-09-18Merge pull request #68492 from worldofpeace/pam-sessionvariablesworldofpeace17-118/+99
2019-09-18nixos/environment: set GTK_EXE_PREFIXworldofpeace1-0/+1
2019-09-18nixos/environment: set GTK_DATA_PREFIXworldofpeace6-29/+2