nixpkgs/nixos/modules/services/x11
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
..
desktop-managers Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
display-managers Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
hardware libinput: disableWhileTyping = false by default 2017-12-30 22:02:16 +00:00
window-managers avoid package attributes starting with a digit 2018-01-16 21:13:16 +01:00
colord.nix
compton.nix compton: adding missing xr_glx_hybrid backend 2017-11-28 14:02:48 +01:00
fractalart.nix fractalart service: init, Generate wallpapers (#23231) 2017-11-13 19:56:08 +01:00
redshift.nix redshift: allow using geoclue2 loation provider 2017-10-21 22:34:14 +01:00
terminal-server.nix nixos: update default cases from KDM/KDE4 to SDDM/KDE5 2017-02-09 21:52:00 -05:00
unclutter-xfixes.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
unclutter.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
urxvtd.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
xautolock.nix nixos/xautolock: fix default defaults/examples, add assertions 2018-01-31 21:43:23 +01:00
xbanish.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
xfs.conf
xfs.nix
xserver.nix Don't set 'config.xorg = {}' 2018-01-11 19:31:05 +01:00