about summary refs log tree commit diff
path: root/nixos/modules/services/x11/xserver.nix
Commit message (Collapse)AuthorAge
* Revert "xserverArgs fuckup"Joachim Fasting2016-10-28
| | | | | | | | | | | | | | | This reverts commit c2922a9157a8d8db62cee763e254113c3766461e. See https://github.com/NixOS/nixpkgs/issues/19930 While the above commit is designed to allow GDM to work, it appears to break other use cases. In particular, it breaks tests involving X usage (e.g., i3wm[1] and firefox[2]), which makes it difficult to assess the impact of other changes and so hampers development of unrelated features. https://hydra.nixos.org/build/42852015 https://hydra.nixos.org/build/42851666
* Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2016-10-22
|\
| * display-manager: Require systemd-udev-settle.serviceEelco Dolstra2016-10-20
| | | | | | | | | | | | | | | | | | | | | | It was already ordered after systemd-udev-settle.service, but that doesn't do anything if no other units require systemd-udev-settle.service. This was causing random failures during X server startup, e.g. machine# [ 12.691372] display-manager[607]: (EE) open /dev/dri/card0: No such file or directory http://hydra.nixos.org/build/41062823
* | xserverArgs fuckupAlexander Ried2016-10-15
|/ | | | | | | | | | | | gnome-x-session provides good defaults which we really should not override. We have to add assertions to gdm.nix if the user specified one of those. enableTCP must be configured through a gnome setting dunno why we have terminate but it probably breaks stuff We should expose configFile so we can use it from gdm module.
* x11 module: don't restart the display manager indefinitely (#19418)zimbatm2016-10-10
| | | | | | | | | | | | * x11 module: don't restart the display manager indefinitely If the display managers crashes continuously in loops it prevents the user from switching to the console and try to fix things. Especially when using the "auto" display manager it can happen quite easily. * x11 module: fix display manager restart timeouts It takes more than 1 second to boot the X server.
* Merge pull request #19196 from groxxda/xkbbindirEelco Dolstra2016-10-03
|\ | | | | xserver: replace XKB_BINDIR with compile time option
| * xserver: replace XKB_BINDIR with compile time optionAlexander Ried2016-10-03
| | | | | | | | | | | | | | | | --- Using the configure option relieves us of the patch and passing the path via the env var in many places. Also the env var may not be inherited when components like gdm spawn new sessions.
* | nixos: xserver typematic configuration optionsCharles Strahan2016-10-03
|/ | | | | This allows one to set the seat defaults for keyboard auto-repeat delay and rate.
* NixOS: Use runCommand instead of mkDerivation in a few placesEelco Dolstra2016-09-29
|
* Make the default fonts conditional on services.xserver.enableEelco Dolstra2016-09-05
| | | | | | | We were pulling in 44 MiB of fonts in the default configuration, which is a bit excessive for headless configurations like EC2 instances. Note that dejavu_minimal ensures that remote X11-forwarded applications still have a basic font regardless.
* nixos/x11: make nvidia driver work againGabriel Ebner2016-08-06
| | | | | | The nvidia driver module directly sets the services.xserver.drivers option, while still having nvidia/nvidiaBeta/... etc. in the videoDrivers option.
* nixos/x11: output sections for modesetting driverGabriel Ebner2016-08-05
| | | | See #17487.
* nixos/x11: remove unneccessary special casesGabriel Ebner2016-07-30
|
* xorg.xorgserver: enable glamor supportGabriel Ebner2016-07-30
|
* Merge #15639: xorg-server 1.17.4 -> 1.18.3Vladimír Čunát2016-06-05
|\ | | | | | | ... and fglrxCompat to maintain compatibility.
| * nixos xserver: fix evdev driver with xserver 1.18Vladimír Čunát2016-05-23
| | | | | | | | | | ... and add its man page. Now I seem to be running fine with the new server.
| * xf86-input-evdev: split dev outputVladimír Čunát2016-05-23
| |
* | X server: Log to the journal instead of /var/log/X.0.logEelco Dolstra2016-05-24
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that "journalctl -u display-manager" does what you would expect in 2016. However, the main reason is to ensure that our VM tests show the output of the X server. A slight problem is that with KDE user switching, messages from the various X servers end up in the same place. However, that's an improvement over the previous situation, where the second X server would overwrite the /var/log/X.0.log of the first. (This was caused by the fact that we were passing a hard-coded value for -logfile.)
* | xf86-video-modesetting: RemoveEelco Dolstra2016-05-22
|/ | | | | This driver is part of xorg-server now, so we were using an outdated version.
* xsession: make updating DBus environment optionalChristoph Ruegge2016-04-25
|
* Merge branch 'staging', containing closure-size #7701Vladimír Čunát2016-04-13
|\
| * Merge branch 'master' into closure-sizeVladimír Čunát2016-04-10
| |\ | | | | | | | | | | | | | | | Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
| * \ Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
| |\ \ | | | | | | | | | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
| * \ \ Merge master into closure-sizeVladimír Čunát2016-03-08
| |\ \ \ | | | | | | | | | | | | | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
| * \ \ \ Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Let's get rid of those merge conflicts.
| * \ \ \ \ Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2015-12-31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
| * | | | | | | nixos/xserver: fix missing modules after splittingVladimír Čunát2015-11-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... xorg-server in e25da7e5.
| * | | | | | | nixos/x11: Refer to correct outputs of libX11 and libXextTuomas Tynkkynen2015-10-03
| | | | | | | |
* | | | | | | | Fix X11 tests broken by the removal of -acEelco Dolstra2016-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably missed a few. Also adding xauth to the system path (it was already in the closure).
* | | | | | | | X server: Enable local access controlEelco Dolstra2016-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the last ten years we have been passing -ac to the X server, which is very bad idea. Fixes #14623.
* | | | | | | | nixos/xserver: Use null as default for dpi optionaszlig2016-04-10
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 98d9bba introduced this option as a nullOr type and it actually checks whether null has been set and only appends -dpi if that's the case. So let's actually set the default to null instead of 0. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | | Add DPI option to xserver invocation.Brandon Edens2016-04-08
| |_|_|_|_|/ |/| | | | |
* | | | | | xserver service: add glamoregl for intel driversNikolay Amiantov2016-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14286 Credits to vcunat for the initial patch.
* | | | | | services.xserver.startGnuPGAgent: remove obsolete NixOS optionPeter Simons2016-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even supports) the "start everything as a child of the agent" scheme we've implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to ~/.xsession or some other appropriate place that's sourced at start-up: gpg-connect-agent /bye GPG_TTY=$(tty) export GPG_TTY If you want to use gpg-agent for SSH, too, also add the settings unset SSH_AGENT_PID export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh" and make sure that enable-ssh-support is included in your ~/.gnupg/gpg-agent.conf. The gpg-agent(1) man page has more details about this subject, i.e. in the "EXAMPLES" section.
* | | | | | nixos/modules/services/x11/xserver.nix: fix minor typoPeter Simons2016-03-18
| |_|_|_|/ |/| | | |
* | | | | xserver service: fix formatting of exampleLeroy Hopson2016-02-27
| |_|_|/ |/| | |
* | | | nixos xserver: remove vaapiDriversNikolay Amiantov2016-01-26
| |_|/ |/| | | | | | | | Use hardware.opengl.extraPackages instead.
* | | xserver service: wait for systemd-logindNikolay Amiantov2016-01-13
| | | | | | | | | | | | | | | This seems the right thing to do, and most likely has fixed the race condition described at https://github.com/NixOS/nixpkgs/issues/12132#issuecomment-171284532
* | | xorgVideoUnichrome: remove dead packageTobias Geerinckx-Rice2016-01-11
| |/ |/| | | | | Broken since 2013, upstream very dead.
* | nixos/xserver: fix evaluation of xkbDirVladimír Čunát2015-12-26
| | | | | | | | | | I solved it this way because it seems the current state-of-the-art 89e983786 The problem was introduced in #11930. Close #11951 (a different solution).
* | xserver: make xkbdir configurableReno Reckling2015-12-24
| |
* | Merge pull request #11228 from ocharles/x-ctrl-alt-backspaceEelco Dolstra2015-12-17
|\ \ | | | | | | services.xserver: Disable Ctrl+Alt+Backspace by default
| * | services.xserver: Disable Ctrl+Alt+Backspace by defaultOllie Charles2015-11-23
| |/ | | | | | | | | | | | | | | | | | | | | | | Ctrl+Alt+Backspace is usually enabled by default under X, and is a keyboard shortcut that forcefully kills the current X server. This can lead to data loss by users if accidentally pressed. This commit introduces a new option, services.xserver.enableCtrlAltBackspace, that is *disabled* by default. If set to true, the previous behavior can be restored. A similar decision was made by the Ubuntu team, and is documented here: https://wiki.ubuntu.com/XorgCtrlAltBackspace
* | nixos/xserver: fix typosThomas Tuegel2015-12-16
| |
* | lightdm & xserver service: add ability to spawn more than one X serverobadz2015-12-15
|/ | | | | | | | - if xserver.tty and/or display are set to null, then don't specify them, or the -logfile argument in the xserverArgs - For lightdm, we set default tty and display to null and we determine those at runtime based on arguments passed. This is necessary because we run multiple X servers so they can't all be on the same display
* xf86_video_nouveau: deprecate this aliasVladimír Čunát2015-09-17
|
* nixos/x11: start session with dbus-launchLuca Bruno2015-06-22
| | | | | | | | | This is needed by most window managers. Desktop environments usually launch dbus-launch if a session hasn't been started yet so this shouldn't hurt. The worst it can happen is that one dbus session will be unused in case it's started twice. The GDM change is backported from recent gdm.
* nixos: set high fs.inotify.max_user_watches when xserver is enabledLuca Bruno2015-06-12
|
* xserver.nix: fix indentation issues under DeviceMateusz Kowalczyk2015-04-18
|
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-07 14:27:00 +0000