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
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
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
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
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
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
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
Elis Hirwing
c45bf10e9f
Merge pull request #68891 from aanderse/moodle
...
nixos/moodle: add extraConfig option
2019-09-17 07:20:07 +02:00
Vladimír Čunát
fa4a3af5a7
Merge branch 'master' into staging-next
2019-09-16 19:24:52 +02:00
Eelco Dolstra
b20a0e49c8
Revert systemd interface version to 2
...
The new systemd in 19.09 gives an "Access Denied" error when doing
"systemctl daemon-reexec" on an 19.03 system. The fix is to use the
previous systemctl to signal the daemon to re-exec itself. This
ensures that users don't have to reboot when upgrading from NixOS
19.03 to 19.09.
2019-09-16 16:51:19 +02:00
Eelco Dolstra
b9ed9c7fed
Typo
2019-09-16 16:50:39 +02:00
Aaron Andersen
7491f85e4f
nixos/moodle: add extraConfig option
2019-09-16 08:03:37 -04:00
Silvan Mosberger
92e653b19b
Fix services.redshift.provider
backwards-incompatibility ( #68852 )
...
Fix `services.redshift.provider` backwards-incompatibility
2019-09-15 21:45:25 +02:00
Silvan Mosberger
e686b39288
nixos/redshift: Add rename for provider option
...
This was an oversight in https://github.com/NixOS/nixpkgs/pull/64309
resulting it backwards incompatibilities
2019-09-15 18:26:53 +02:00
Silvan Mosberger
ecf5f85a81
nixos/redshift: Move option renames to the module
2019-09-15 18:25:40 +02:00
Mikhail Klementev
d4e8f7908d
NixOS/auto-upgrade: add gzip to service path
...
Resolves #28527
2019-09-15 16:13:29 +02:00
Maximilian Bosch
80e2c41b87
Merge pull request #68435 from averelld/nextcloud-fix-deprecation-warning
...
nextcloud: fix deprecation warning
2019-09-15 15:35:32 +02:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next
2019-09-15 13:18:54 +02:00
Will Dietz
447d625edc
networkmanager,modemmanager: fix service symlinks for systemd v243
...
Fixes problems such as:
systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.
Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.
These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.
To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.
Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
2019-09-14 08:05:27 -04:00
worldofpeace
3cb0ae999f
Revert "networkmanager,modemmanager: fix service symlinks for systemd v243"
2019-09-14 08:04:28 -04:00