Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Joachim Fasting
5f09248ae8
Merge pull request #15228 from rnhmjoj/master
...
unclutter: switch to user service and add options
2016-05-05 18:37:27 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
rnhmjoj
e34814e317
unclutter: switch to user service and add options
2016-05-04 21:15:49 +02:00
Mitchell Pleune
571e9b5f1f
bspwm: add _JAVA_AWT_WM_NONREPARENTING=1
...
bspwm is not in java's internal list of non-reparrenting
window managers. See https://awesomewm.org/wiki/Problems_with_Java
2016-05-03 17:46:48 -04:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Thomas Tuegel
dbe1bb06d9
Merge pull request #14741 from cruegge/dbus-activation-environment
...
xsession: Update DBus activation environment
2016-05-01 06:55:35 -05:00
Thomas Tuegel
370120bd5f
kde5: don't install GStreamer modules system-wide
2016-04-30 12:22:01 -05:00
Nikolay Amiantov
c4440c9c74
Revert "pulseaudio: select correct outputs"
...
This reverts commit 5e2bb0b31c
.
2016-04-28 17:06:09 +03:00
Nikolay Amiantov
5e2bb0b31c
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:45:42 +03:00
Nikolay Amiantov
d619a75da1
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:42:16 +03:00
Thomas Tuegel
522ed7ce76
nixos/kde5: phonon-backend-gstreamer is not optional
2016-04-25 19:04:24 -05:00
Thomas Tuegel
5896befee0
nixos/kde5: install kactivitymanagerd
2016-04-25 19:04:24 -05:00
Christoph Ruegge
769a33bedd
xsession: make updating DBus environment optional
2016-04-25 23:37:18 +02:00
Nikolay Amiantov
5f19542581
Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:23 +03:00
Nikolay Amiantov
09f02b918e
Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:10 +03:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Franz Pletz
882391a162
redshift service: run as user service
...
Fixes #14882 .
2016-04-24 19:48:10 +02:00
Thomas Tuegel
b4ff81ffd6
phonon-backend-vlc: init at 0.9.0
2016-04-22 08:11:10 -05:00
Thomas Tuegel
8b585cc9f5
phonon: 4.8.3 -> 4.9.0
...
- Removed phonon-backend-vlc.
- Moved qt5.phonon to kde5.phonon.
2016-04-22 07:56:02 -05:00
Thomas Tuegel
2780894b1b
kde5.startkde: init at 5.5.5
2016-04-20 10:01:06 -05:00
Christoph Ruegge
f270af1acd
xsession: Update DBus activation environment
...
`dbus-launch` is executed early in the script, before desktop managers
had a chance to setup the environment. If DBus activation is used,
applications launched by this may therefore lack necessary environment
variables. This patch sends the complete environment to DBus after
launching the desktop manager.
2016-04-15 21:43:42 +02:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Eelco Dolstra
9153d8ed64
Fix X11 tests broken by the removal of -ac
...
Probably missed a few. Also adding xauth to the system path (it was
already in the closure).
2016-04-12 19:13:47 +02:00
Eelco Dolstra
1541fa351b
X server: Enable local access control
...
For the last ten years we have been passing -ac to the X server, which
is very bad idea.
Fixes #14623 .
2016-04-12 18:39:40 +02:00
aszlig
c1178f171c
nixos/xserver: Use null as default for dpi option
...
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>
2016-04-10 17:46:17 +02:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Brandon Edens
98d9bbaec2
Add DPI option to xserver invocation.
2016-04-08 18:53:42 -07:00
Thomas Tuegel
4ac323d924
kde5: enable libmtp udev rules
2016-04-07 07:44:26 -05:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Nikolay Amiantov
63f1eb6b00
xserver service: add glamoregl for intel drivers
...
Closes #14286
Credits to vcunat for the initial patch.
2016-03-29 18:52:04 +03:00
joachifm
3273605aef
Merge pull request #14033 from joachifm/clfswm-broken
...
Mark clfswm as broken
2016-03-20 15:27:41 +00:00
Joachim Fasting
e891e50946
nixos: disable the clfswm window manager module
2016-03-19 15:52:18 +01:00
Peter Simons
5391882ebd
services.xserver.startGnuPGAgent: remove obsolete NixOS option
...
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.
2016-03-18 11:06:31 +01:00
Peter Simons
de11380679
nixos/modules/services/x11/xserver.nix: fix minor typo
2016-03-18 11:02:01 +01:00
Nikolay Amiantov
305fa26005
Merge pull request #13850 from abbradar/e20
...
Update Enlightenment, rename e19 -> enlightenment, drop e16
2016-03-14 02:28:58 +03:00
Nikolay Amiantov
7fb2291f55
enlightenment.enlightenment: 0.20.3 -> 0.20.6
2016-03-12 03:10:47 +03:00
Nikolay Amiantov
3f6ad460e7
enlightenment.efl: 1.16.1 -> 1.17.0
2016-03-12 03:10:46 +03:00
Nikolay Amiantov
e358d9498c
e19: rename to enlightenment, drop old one
2016-03-12 03:10:37 +03:00
Thomas Tuegel
d8dceb7077
kde5: install colord-kde when colord is enabled
2016-03-11 08:45:50 -06:00
Nikolay Amiantov
08893956fb
Merge pull request #13823 from abbradar/colord
...
colord color management daemon
2016-03-11 13:50:12 +03:00
Nikolay Amiantov
4e58b33dee
colord service: init
2016-03-11 01:58:40 +03:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
José Romildo Malaquias
82e12688a2
jwm: window manager module addition
2016-03-07 16:07:13 -03:00
Brian McKenna
f3d6e9ec71
exwm service: init
2016-03-06 09:04:51 +11:00
Maxwell
e50da7ee6a
bspwm: add startThroughSession & sessionScript option
...
Add ability to do a more traditional bspwm startup (using the bspwm-session
script provided by nixpkgs.bspwm) as an alternative to directly starting
sxhkd & bspwm
Also added the ability to specify a custom startup script, instead of
relying on the provided bspwm-session
2016-03-01 17:29:15 -05:00
Eelco Dolstra
f3d94cfc23
Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
...
This reverts commit cad8957eab
. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
2016-03-01 20:52:06 +01:00
joachifm
3d382e7f22
Merge pull request #13522 from Pleune/fix/x11-bspwm-update
...
x11 service: bspwm limit sxhkd freqency
2016-03-01 00:03:22 +00:00
Luca Bruno
55c20bfe89
Merge pull request #10288 from lethalman/gnomeiso
...
installer: add graphical GNOME iso
2016-02-29 15:56:47 +01:00