Vladimír Čunát
6c567ed797
Merge branch 'staging-next' into staging
2019-09-22 10:06:45 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
...
This reverts commit f8a8fc6c7c
.
2019-09-22 09:38:09 +02:00
Mario Rodas
54433c443b
nixos/spotifyd: update spotifyd flags
2019-09-21 17:10:00 -05:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372
, reversing
changes made to f0fec244ca
.
Let's delay this. We have some serious regressions.
2019-09-21 20:05:09 +02:00
Sascha Grunert
2c3dcbb9d0
Add cri-o service to modules ( #68153 )
...
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-09-21 14:18:42 +00:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next'
2019-09-21 13:14:09 +02:00
Elis Hirwing
89b0ef6589
Merge pull request #69195 from c0deaddict/fix/gitea-dump
...
nixos/gitea: fix dump
2019-09-21 10:02:41 +02:00
Jos van Bakel
86b83f37b8
nixos/gitea: fix dump
2019-09-21 09:28:53 +02:00
Matthew Bauer
d8b7b95ac6
Merge remote-tracking branch 'origin/master' into staging
2019-09-20 23:25:24 -04:00
Silvan Mosberger
f47ef8fcf7
sdImage: use findmnt to get root device when resizing ( #58059 )
...
sdImage: use findmnt to get root device when resizing
2019-09-20 23:28:01 +02:00
worldofpeace
1e6f4fb2bc
Merge pull request #68983 from worldofpeace/xfce-cleanup
...
Touchups for nixos/xfce4-14 for 19.09
2019-09-19 13:25:03 -04:00
Eelco Dolstra
b0ccd6dd16
Revert "nixos/doc: re-format"
...
This reverts commit ea6e8775bd
. The new
format is not an improvement.
2019-09-19 19:17:30 +02:00
worldofpeace
db3d31b903
Merge pull request #69093 from alexarice/xterm-default
...
nixos/xterm: Set default to xserver.enable
2019-09-19 13:05:49 -04:00
Frederik Rietdijk
f81d43b94c
Merge staging-next into staging
2019-09-19 17:00:07 +02:00
Frederik Rietdijk
0b12d44c06
Merge master into staging-next
2019-09-19 16:59:42 +02:00
Eelco Dolstra
387a2f27ec
Merge pull request #68906 from edolstra/revert-interface-version
...
Revert systemd interface version to 2
2019-09-19 14:09:18 +02:00
Alex Rice
cf56cefd95
xterm: Set default to xserver.enable
2019-09-19 12:27:05 +01:00
Marek Mahut
0358bc174b
nixos/jormungandr: moving to a new section topics_of_interest
2019-09-19 10:51:59 +02:00
worldofpeace
58f090cc7b
Merge pull request #69031 from worldofpeace/xcursor-update
...
nixos/xdg/icons: match XCURSOR_PATH spec
2019-09-18 17:42:20 -04:00
Jan Tojnar
0902f08e0d
Merge branch 'staging-next' into staging
2019-09-18 22:40:42 +02:00
Jan Tojnar
105abdd52c
Merge branch 'master' into staging-next
2019-09-18 22:40:03 +02:00
Jan Tojnar
c28659e2fb
doc: Disable wrapping source ( #68181 )
...
doc: Disable wrapping source
2019-09-18 22:33:56 +02:00
Jan Tojnar
ea6e8775bd
nixos/doc: re-format
2019-09-18 22:13:35 +02:00
Maximilian Bosch
713fda2eb5
nixos/sway: install swaybg by default
2019-09-18 21:50:18 +02:00
Jan Tojnar
641f6356d3
doc: Disable wrapping source
...
Even a simple typo fix can result in a reflow of a whole paragraph, leading to illegible diffs. The majority of text editors supports wrapping the source code to a comfortable width so it makes sense to me to sacrifice the few that do not rather than the unfortunately line-oriented diff tools.
2019-09-18 21:17:52 +02:00
Jan Tojnar
f5ef80b46d
Merge branch 'staging-next' into staging
2019-09-18 21:16:01 +02:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next
2019-09-18 21:15:35 +02:00
worldofpeace
b3f4ce351e
nixos/xdg/icons: match XCURSOR_PATH spec
2019-09-18 13:03:14 -04:00
worldofpeace
760b677c19
Merge pull request #68729 from worldofpeace/elementary-greeter/master
...
nixos/pantheon: use Pantheon's greeter
2019-09-18 11:16:21 -04:00
worldofpeace
ee29fbd9a2
Merge pull request #68492 from worldofpeace/pam-sessionvariables
...
Introduce environment.profileRelativeSessionVariables
2019-09-18 11:15:26 -04:00
worldofpeace
6663a795a3
nixos/environment: set GTK_EXE_PREFIX
2019-09-18 11:13:43 -04:00
worldofpeace
cc125810cb
nixos/environment: set GTK_DATA_PREFIX
...
Many desktop environment modules are already setting
this so it already makes sense to just do this globally.
2019-09-18 11:13:43 -04:00
worldofpeace
5669b06235
lightdm-mini-greeter: put xgreeters in passthru
2019-09-18 11:13:43 -04:00
worldofpeace
b558eb8329
nixos/lightdm-gtk-greeter: don't wrap in module
2019-09-18 11:13:43 -04:00
worldofpeace
7814a2f566
nixos/enso-os: don't wrap in module
2019-09-18 11:13:42 -04:00
worldofpeace
feab607ae5
nixos/sddm: don't set XDG_DATA_DIRS
...
environment.profileRelativeSessionVariables should make this unneeded.
2019-09-18 11:13:42 -04:00
worldofpeace
453036c8a7
nixos/gdm: don't set XCURSOR_PATH
2019-09-18 11:13:42 -04:00
worldofpeace
df56adac53
nixos/xdg/icons: use profileRelativeSessionVariables
2019-09-18 11:13:42 -04:00
worldofpeace
671404509b
nixos/terminfo: use profileRelativeSessionVariables
2019-09-18 11:13:42 -04:00
Robert Helgesson
866cc3e792
nixos/system-environment: introduce environment.profileRelativeSessionVariables
...
There is a need for having sessionVariables set relative to the Nix Profiles.
Such as in #68383 .
2019-09-18 11:09:43 -04:00
Joachim Fasting
eb59755f70
tests/hardened: fix build
...
Bug introduced by 4ead3d2ec3
For ZHF https://github.com/NixOS/nixpkgs/issues/68361
2019-09-18 15:38:43 +02:00
worldofpeace
0b73294d60
fixup! nixos/xfce4-14: cleanup defaults slightly
2019-09-17 19:49:18 -04:00
Robin Gloster
9566ec034b
hardware.brightnessctl: add brightnessctl to env
2019-09-18 00:06:11 +02:00
worldofpeace
6bd2a8f08c
Merge pull request #68987 from worldofpeace/closures
...
nixos/release: add gnome3 closure
2019-09-17 17:53:32 -04:00
worldofpeace
fb45993a62
nixos/release: add gnome3 closure
2019-09-17 17:48:40 -04:00
worldofpeace
f6398d8ba2
nixos/xfce4-14: cleanup defaults slightly
...
We added
- parole
- pavucontrol
- xfce4-taskmanager
- xfwm4-themes
to the default packages.
2019-09-17 17:05:39 -04:00
worldofpeace
f85e126f8c
nixos/xfce4-14: add gnome-themes-extra
2019-09-17 17:05:39 -04:00
worldofpeace
5bcec7642f
nixos/xfce4-14: remove gtk-xfce-engine
...
Xfce 4.14 deprecated this.
It had many gtk2 themes that don't work that confused users #68977 .
2019-09-17 17:05:39 -04:00
Alex Whitt
f01224374d
nixos/jenkins: Copy plugins as .jpi to fix initialization errors
2019-09-17 19:54:57 +02:00
Antoine R. Dumont (@ardumont)
35fe50352f
nixos/minidlna: Allow more configuration options
...
This commits allows the user to configure:
- more minidlna options
- the ones not yet disclosed in nix (extending the existing minimal subset)
2019-09-17 19:51:33 +02:00