Commit graph

28 commits

Author SHA1 Message Date
Tor Hedin Brønner
2c8565a3ce
nixos/gdm: use XDG_DATA_DIRS to find sessions
Gdm now searches for session files in XDG_DATA_DIRS so we no longer need the
sessions_dir.patch.
2018-11-30 21:34:47 +01:00
Jan Tojnar
5d6e2395ca
gnome3.gdm: 3.28.3 → 3.30.2 2018-11-30 21:33:57 +01:00
Tor Hedin Brønner
f908bf2730 gnome3.gdm: Always reset the environment for new sessions
When GDM launches a new session it will inherit the user's systemd
environment (but only unset variables). If `__NIXOS_SET_ENVIRONMENT_DONE` is set
in the user's systemd environment it will prevent the environment to be set
properly or updated (eg. after having done a system rebuild).

Gnome sessions exports their environment to systemd at startup. If something
is keeping the user's systemd process alive (eg. ssh) launching a new gnome
session after logging out will result in a broken PATH. Specifically the PATH
will be inherited from GDM and never reset.

We patch GDM to never inherit `__NIXOS_SET_ENVIRONMENT_DONE` so new sessions
will always reset their base environment.

fixes https://github.com/NixOS/nixpkgs/issues/48255

For more info about the environment setup:
https://github.com/NixOS/nixpkgs/pull/45784
2018-10-16 07:09:46 +02:00
Jan Tojnar
5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
Matthew Bauer
1ffe83caa7
Merge pull request #42846 from ambrop72/optimus-prime-config-master
nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME
2018-10-03 22:56:53 -05:00
Andreas Rammhold
a4ded94f95
gnome3.gdm: 2.28.2 -> 2.28.3
Changes:
  - CVE-2018-14424 - double free fix
  - lifecycle fixes to libgdm/GdmClient
  - follow up fixes dealing with login screen reaping form last release
  - allow pam modules to use SIGUSR1
  - set PWD for user session
  - tell cirrus not to use wayland
  - Translation updates
2018-08-17 09:22:27 +02:00
Jan Tojnar
cc6d77c83f
gnome3.gdm: add upstream xsession 2018-08-01 19:14:30 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Ambroz Bizjak
f26153754a nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME
This adds configuration options which automate the configuration of NVIDIA Optimus using PRIME. This allows using the NVIDIA proprietary driver on Optimus laptops, in order to render using the NVIDIA GPU while outputting to displays connected only to the integrated Intel GPU. It also adds an option for enabling kernel modesetting for the NVIDIA driver (via a kernel command line flag); this is particularly useful together with Optimus/PRIME because it fixes tearing on PRIME-connected screens.

The user still needs to enable the Optimus/PRIME feature and specify the bus IDs of the Intel and NVIDIA GPUs, but this is still much easier for users and more reliable. The implementation handles both the X configuration file as well as getting display managers to run certain necessary `xrandr` commands just after X has started.

Configuration of commands run after X startup is done using a new configuration option `services.xserver.displayManager.setupCommands`. Support for this option is implemented for LightDM, GDM and SDDM; all of these have been tested with this feature including logging into a Plasma session.

Note: support of `setupCommands` for GDM is implemented by making GDM run the session executable via a wrapper; the wrapper will run the `setupCommands` before execing. This seemed like the simplest and most reliable approach, and solves running these commands both for GDM's X server and user X servers (GDM starts separate X servers for itself and user sessions). An alternative approach would be with autostart files but that seems harder to set up and less reliable.

Note that some simple features for X configuration file generation (in `xserver.nix`) are added which are used in the implementation:
- `services.xserver.extraConfig`: Allows adding arbitrary new sections. This is used to add the Device section for the Intel GPU.
- `deviceSection` and `screenSection` within `services.xserver.drivers`. This allows the nvidia configuration module to add additional contents into the `Device` and `Screen` sections of the "nvidia" driver, and not into such sections for other drivers that may be enabled.
2018-07-09 18:46:13 +02:00
Jan Tojnar
17a8d7f5a4
gnome3.gdm: 3.28.1 → 3.28.2 2018-06-06 11:39:22 +02:00
Jan Tojnar
3bfa8563d1
gnome3.gdm: fix wayland detection
Apparently, wayland session were not used at all until now.
2018-05-16 16:25:21 +02:00
Jan Tojnar
6f23e142cb
gnome3.gdm: clean up 2018-05-16 16:25:20 +02:00
Jan Tojnar
300af66777
gnome3.gdm: fix session chooser
We are patching GDM to respect GDM_SESSIONS_DIR environment
variable, which we are setting in the GDM module. Previously, we
only took care of a single code path, the one that handled session
start-up; missing the one obtaining the list of sessions.

This commit patches the second code path, and also whitelists the
GDM_SESSIONS_DIR so that it can be passed to the greeter.

Fixes #34101
2018-05-06 22:20:56 +02:00
Jan Tojnar
72b27f2519
gnome3: 3.28.0 → 3.28.1 2018-04-14 13:35:45 +02:00
Jan Tojnar
0973618e4e
gnome3: automated update 2018-03-22 07:46:42 +01:00
Jan Tojnar
546e7669b2
gnome3: move src.nix into default.nix automatically 2018-03-01 02:53:00 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Vladimír Čunát
6345089ca0
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
2017-11-27 12:19:01 +01:00
Jan Tojnar
613a2fa13a
gnome3.gdm: 3.26.0 → 3.26.2.1 2017-11-26 03:10:59 +01:00
Jan Tojnar
c9fe6567ed
gnome3.gdm: replace hardcoded paths 2017-11-26 03:10:54 +01:00
Jan Tojnar
3f610ddd81
gnome3.gdm: prevent orca warning 2017-11-26 03:10:50 +01:00
Jan Tojnar
0f06bab3f3
gnome3: 3.24 -> 3.26 2017-11-26 03:10:47 +01:00
Pierre Chevalier
37875c4a77 gdm: start gdm on tty7 rather than default tty1
- Fixes nixos-rebuild switch/test issue with GNOME
  https://github.com/NixOS/nixpkgs/issues/21439
- The solution was given here:
  d761e66a41 (commitcomment-25382880)
2017-11-19 19:35:37 +01:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Jan Tojnar
69698ec11c gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.
2017-09-24 12:15:50 +01:00
Luca Bruno
d05fa3ccfe Branch gnome 3.12 2014-05-20 13:41:33 +02:00
Domen Kožar
7546695dbb gdm: add gobject introspection support 2014-01-26 00:19:06 +01:00
Rob Vermaas
01291d331c Gnome3: add gdm 3.10.0.1 2014-01-11 23:42:40 +01:00