mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
76321 commits 218 branches 122 tags 7.1 GiB
Commit graph

387 commits

Author SHA1 Message Date
Arseniy Seroka 558dbbc7f3 Merge pull request #8947 from AndersonTorres/oroborus 
Oroborus (2.0.20): New Package
 2015-07-26 20:03:47 +03:00
AndersonTorres bdd20cedc1 IceWM: 1.3.8 -> 1.3.10 
A complete rewrite in comparision to previous expression.
 2015-07-26 01:08:05 -03:00
Jascha Geerds 3d9a4d79cf gnome3: Include gnome-shell-extensions in session path 2015-07-24 12:41:20 +02:00
AndersonTorres d004ac6857 Oroborus: init at 2.0.20 
Oroborus (named after the self-eating snake) is a minimalistic window manager.
 2015-07-23 13:50:26 -03:00
Austin Seipp 0c4fca7d61 Merge pull request #8690 from laMudri/synaptics 
synaptics: fix to allow for more scrolling choices
 2015-07-19 12:50:33 -05:00
Vladimír Čunát 9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Arseniy Seroka 19e5fd60b3 slim: use nixos theme by default 2015-07-17 17:01:07 +03:00
William A. Kennington III 6281c618cf lightdm: Fix location of loaders.cache after 4982143324 2015-07-15 15:30:39 -07:00
James Felix Black be5ad1d07c window-manager service: add notion 
Add the notion window manager to the windowManager service definition.
 2015-07-14 12:36:59 -04:00
laMudri 0f63a624f7 synaptics: fix to allow for more scrolling choices 2015-07-07 20:56:13 +01:00
Damien Cassou ffe164d758 Merge pull request #8484 from DamienCassou/fix-blocking-stumpwm-module 
Don't block the system after starting stumpwm
 2015-06-26 11:40:59 +02:00
Damien Cassou 0bd3737bd0 stumpwm: don't block after starting stumpwm 
This is important to let nixos configure everything, e.g., a desktop
manager.
 2015-06-26 11:38:04 +02:00
Thomas Tuegel 0aa8e64967 kde5: JSON manifest format 2015-06-25 09:03:40 -05:00
Luca Bruno f00440fac5 nixos/x11: start session with dbus-launch 
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.
 2015-06-22 16:12:20 +00:00
Damien Cassou 90912f8aa5 Merge pull request #8401 from DamienCassou/document-desktopManagerHandlesLidAndPower-in-systemd 
Explanation to desktopManagerHandlesLidAndPower
 2015-06-19 14:02:04 +02:00
Damien Cassou 26e424a4aa Explanation to desktopManagerHandlesLidAndPower 
With this patch, systemd-inhibit outputs a descriptive message when
desktopManagerHandlesLidAndPower=true (the default).

Before the patch:

    $ systemd-inhibit
         Who: /nix/store/[...]-xsession [...] (UID 1000/cassou, PID 18561/systemd-inhibit)
        What: handle-power-key:handle-lid-switch
         Why: Unknown reason
        Mode: block

After the patch:

    $ systemd-inhibit
         Who: /nix/store/[...]-xsession [...] (UID 1000/cassou, PID 18561/systemd-inhibit)
        What: handle-power-key:handle-lid-switch
         Why: See NixOS configuration option 'services.xserver.displayManager.desktopManagerHandlesLidAndPower' for more information.
        Mode: block
 2015-06-19 11:16:32 +02:00
Luca Bruno d5628c982d Bypass /etc/gdm/Xsession. Closes #8351 2015-06-16 11:20:20 +00:00
Eelco Dolstra 19ffa212af types.uniq types.int -> types.int 
types.int already implies uniqueness.
 2015-06-15 18:11:32 +02:00
Eelco Dolstra 9366af1b94 "types.uniq types.string" -> "types.str" 2015-06-15 18:08:49 +02:00
Luca Bruno da7748a6fc nixos: set high fs.inotify.max_user_watches when xserver is enabled 2015-06-12 13:02:35 +02:00
William A. Kennington III 48381b7621 nixos-artwork: Make into a derivation and use fetchfromgithub 2015-06-08 18:32:32 -07:00
William A. Kennington III 4f943ef237 nixos/lightdm: More changes 2015-05-21 20:10:52 -07:00
William A. Kennington III acdc3e6c9a nixos/lightdm: Some fixups 2015-05-20 18:32:12 -07:00
Luca Bruno 25f9555599 Drop GNOME 3.12 2015-05-18 12:24:08 +02:00
Thomas Tuegel 2325791c2b plasma53: patch upstream startkde 
Rather than shipping our own startkde script, we will go back to
patching upstream's script. This will be less confusing to potential
contributors.
 2015-05-03 17:09:50 -05:00
Herwig Hochleitner c600f5af25 gnome3: move definition of package sets into pkgs 2015-04-28 02:54:14 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Luca Bruno db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Mateusz Kowalczyk 5676e8b391 lightdm: allow the user to specify extra Seat opts 2015-04-18 20:14:10 +01:00
Mateusz Kowalczyk 1713184b11 xserver.nix: fix indentation issues under Device 2015-04-18 19:04:03 +01:00
Mateusz Kowalczyk d7810b4303 Hard tabs be gone! 2015-04-18 18:52:15 +01:00
Mateusz Kowalczyk 70aa758c34 Fix RightOf for xrandrHeads 
Closes #7441
 2015-04-18 18:34:28 +01:00
Daniel Ehlers 057f01b11e services.x11: Add option for additional InputClass sections. 
Implement support for additional InputClass sections, e.g. for non
keyboard input devices.
 2015-04-12 23:49:48 +02:00
Joachim Fasting c5ec6ef609 window-managers: add missing import ratpoison 2015-04-08 14:14:37 +02:00
William A. Kennington III ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
Edward Tjörnhammar 1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00
William Casarin ea2baa8abf spectrwm window manager 2015-03-21 11:02:44 -07:00
Vladimír Čunát 208d1f24db xfce: more update fallout 
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
 2015-03-12 23:02:15 +01:00
Thomas Tuegel 61cf7e1265 Merge branch 'kde5' 2015-03-11 11:49:45 -05:00
Thomas Tuegel f370af91ad kde5: use ksshaskpass for SSH_ASKPASS 2015-03-11 11:49:29 -05:00
Thomas Tuegel 5b5b7aa951 kde5: add kde-workspace and kde-runtime to systemPackages 2015-03-11 11:49:28 -05:00
lethalman c8ac069772 Merge pull request #6724 from anderspapitto/local 
Add x11 service for unclutter
 2015-03-11 15:32:40 +01:00
Arseniy Seroka 1c58c3a772 Merge pull request #6345 from puffnfresh/feature/mtrack-options 
Add more options to multitouch (mtrack) module
 2015-03-11 11:10:51 +03:00
William A. Kennington III 26020cfe8a nixos/lightdm: Add a background option 2015-03-10 15:57:46 -07:00
William A. Kennington III e519414e1f nixos/lightdm: Fix data directory 2015-03-10 14:55:54 -07:00
William A. Kennington III 3a67a51689 nixos/lightdm: Small cleanup 2015-03-10 14:35:49 -07:00
William A. Kennington III ffed8a85bc nixos/sddm: Hide users which don't have login shells 2015-03-10 14:32:53 -07:00
William A. Kennington III 5893d2ecd3 nixos/lightdm: More Cleanups 2015-03-10 14:23:43 -07:00
William A. Kennington III 7b6e2e1c68 lightdm: Fix rendering 2015-03-10 14:03:18 -07:00
William A. Kennington III 4940e643cc nixos/display-manager: Support configurable hidden users 2015-03-09 18:10:31 -07:00
William A. Kennington III 66bfdf6eb0 nixos/lightdm: We now use a global lightdm.conf 2015-03-09 17:59:21 -07:00
Anders Papitto 887a547ac9 Add x11 service for unclutter 
modeled after the redshift service
 2015-03-08 20:12:18 -07:00
obadz e5d4624420 PAM/eCryptfs now able to mount ecryptfs'd home directories on login 2015-03-08 16:03:51 -07:00
Nikolay Amiantov 4fde098eec Merge pull request #6677 from abbradar/sddm 
Add SDDM display manager
 2015-03-05 21:03:43 +03:00
Nikolay Amiantov 4f317767da lightdm: don't leave a shell running 2015-03-05 20:49:45 +03:00
Nikolay Amiantov db5b08cfaf nixos/sddm: add display manager 2015-03-05 20:49:26 +03:00
lethalman 373c4ce0ec Merge pull request #6605 from AndersonTorres/afterstep 
Adding Afterstep to nixos window manager modules
 2015-03-02 18:00:28 +01:00
AndersonTorres 929485b645 Adding Afterstep to nixos modules 2015-02-28 11:14:33 -03:00
AndersonTorres 5472af91f2 Fluxbox: update to 1.3.7 2015-02-28 11:04:20 -03:00
Eelco Dolstra 36d0f367de ssh-agent: Fix asking for confirmation via $SSH_ASKPASS 
This was lost back in
ffedee6ed5. Getting this to work is
slightly tricky because ssh-agent runs as a user unit, and so doesn't
know the user's $DISPLAY.
 2015-02-25 14:31:17 +01:00
Thomas Tuegel d15d0bebc3 kde5: remove file collisions 2015-02-21 20:58:43 -06:00
Thomas Tuegel 68f2db74ff kde5: always use plasma-nm 2015-02-21 13:59:28 -06:00
Thomas Tuegel 7eb8a9b41f kde5: install media-player-info udev rules for solid 2015-02-21 11:39:21 -06:00
Thomas Tuegel 532650e4bb kde5: change notice about default Phonon backend 2015-02-21 11:39:21 -06:00
Thomas Tuegel e5de75bf2a kde5: install kde-frameworks version used by plasma 2015-02-21 11:39:21 -06:00
Thomas Tuegel b050babd3e kde5: fix Phonon GStreamer backend 2015-02-21 11:39:20 -06:00
AndersonTorres f19ed980a2 Sawfish (git): New Package 
Sawfish is a versatile, Lisp-based window manager

In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
 2015-02-15 19:42:53 +03:00
Brian McKenna 28a9ed618f Add more options to multitouch (mtrack) module 2015-02-14 14:56:12 -07:00
Luca Bruno f7b26bf98f gnome3: Set XCURSOR_PATH. Closes #6191 2015-02-11 11:48:51 +00:00
lethalman 12834a8500 Merge pull request #6072 from AndersonTorres/window-managers 
Update NixOS module files to include WindowMaker
 2015-02-10 13:06:06 +01:00
AndersonTorres fff55a968e Update NixOS module files to include WindowMaker 
According to a hint on NixOS mailing list[1], I updated nixos/modules/services/x11/window-managers/default.nix
to include windowmaker.

1 - https://github.com/NixOS/nixpkgs/pull/4066#issuecomment-72017611
 2015-02-03 21:24:12 -02:00
Nikolay Amiantov b7bb524f04 nixos/xmonad: move to haskell-ng and make a wrapper 2015-02-03 01:05:23 +03:00
Thomas Tuegel 0fee7a2b21 fontconfig: stringify dpi correctly 2015-02-01 16:18:48 -06:00
Thomas Tuegel 63ec1a9677 add stable attrs for plasma5, kf5, and kdeApps 2015-01-26 21:01:07 -06:00
Thomas Tuegel a55543711e kde5: simplify package list 2015-01-26 21:01:06 -06:00
Thomas Tuegel 3a97ea592f kdm: install default backgrounds 2015-01-26 21:01:06 -06:00
Thomas Tuegel 726b80bc87 startkde: don't split script between NixOS module and package 2015-01-26 21:01:06 -06:00
Thomas Tuegel e7508b831f kde5: warn if enabled with kde4 2015-01-26 21:01:05 -06:00
Thomas Tuegel 16b54d19d3 kde5: rename plasma5 desktop module 2015-01-26 21:01:05 -06:00
Thomas Tuegel 5c52354ee8 add NixOS module for Plasma desktop 2015-01-26 21:00:38 -06:00
Edward Tjörnhammar 6bbec634a7 Merge pull request #5850 from edwtjo/kodi-plugins 
XBMC to Kodi migrations
 2015-01-24 14:17:14 +01:00
aszlig 127c928c23
nixos/rename: Fix merging multiple destinations. 
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.

We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-22 14:08:28 +01:00
Edward Tjörnhammar 5b1c9417a8 Add Kodi desktop-manager 2015-01-19 22:14:36 +01:00
Matej Cotman 4e6efec4b4 enlightenment: fix media preview 2015-01-13 14:56:35 +01:00
Vladimír Čunát 3c050d00a5 upower: use newer version by default 
Tested on KDE4, fixed with xfce, and was used with GNOME before.
CC @lethalman.

I did not test e19, as it won't build, probably due to #5392 @shlevy.
CC maintainer @matejc.

Also removed a forgotten unused patch.
 2014-12-27 22:46:46 +01:00
Luca Bruno 79209e30b5 nixos: Add -verbose to xserverArgs example 2014-12-22 21:01:12 +01:00
lethalman 50789593df Merge pull request #5346 from svenkeidel/disable-xserver-verbose-logging 
disable verbose logging for XServer, fixes #4333
 2014-12-22 20:59:06 +01:00
Evgeny Egorochkin 87610ca0fd kde4: enable akonadi by default 2014-12-19 08:59:22 +02:00
Luca Bruno 614162ee6c Some lua and awesome improvements 
- Move lgi to luaPackages
- Use luaPackages in awesome and passthru lua
- Allow to pass lua modules to the awesome WM so that those can be used in the configuration
 2014-12-17 15:08:21 +01:00
Sven Keidel 7199db8aab disable verbose logging for XServer, fixes #4333 
The current options for the XServer produce a huge amount of log messages. The
server produces around 70-80 messages per minute. The most messages look like
this:

display-manager-start[1846]: GetModeLine - scrn: 0 clock: 75200
display-manager-start[1846]: GetModeLine - hdsp: 1366 hbeg: 1414 hend: 1478 httl: 1582
display-manager-start[1846]: vdsp: 768 vbeg: 772 vend: 779 vttl: 792 flags: 9

Since theses messages aren't very useful, I propose to remove the `-logverbose`
and `-verbose` options from the XServer arguments.
 2014-12-15 18:59:49 +01:00
Thomas Tuegel 8991ff7ceb Load default Fontconfig settings into Xresources for Xft 2014-12-08 10:55:24 -06:00
Matej Cotman 084fb3a0d3 e18: remove old desktop manager 2014-11-26 21:44:23 +01:00
Matej Cotman 959946a5af e17: remove old desktop manager 2014-11-26 21:44:23 +01:00
Evgeny Egorochkin f151f4c816 KDE4: fix sound using the old gstreamer approach; the correct way would be to wrap each and every phonon client, or patch phonon's search path 2014-11-15 21:40:13 +02:00
Luca Bruno e8adc8b5ec Drop GNOME 3.10 2014-11-14 22:46:37 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Nikolay Amiantov aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Aristid Breitkreuz 8b949e5ff5 Merge pull request #4823 from abbradar/synaptics-fix 
synaptics: fix tapButtons setting
 2014-11-08 19:38:06 +01:00
Pascal Wittmann d6e87f1749 Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670 2014-11-08 15:25:40 +01:00
Nikolay Amiantov 5f84c785ff synaptics: fix tapButtons setting 2014-11-04 06:20:10 +03:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Peter Simons e18e77fbcd Merge pull request #4746 from abbradar/synaptics-fingers 
Add "fingersMap" option to Synaptics
 2014-10-31 11:06:58 +01:00
Nikolay Amiantov 118096fc0b synaptics: add fingersMap option 2014-10-31 12:45:54 +03:00
Nikolay Amiantov 0eb86647b3 synaptics: add types to options 2014-10-31 12:45:54 +03:00
Kirill Elagin 0c6d49da7d xsession: Start the right pulseaudio binary 
Fixes #4663.
 2014-10-27 15:43:19 +03:00
Aristid Breitkreuz dabdab8dce Merge pull request #4640 from lethalman/installer-icons 
kde installer: Add gparted, nixos manual and konsole in the desktop
 2014-10-25 16:32:56 +02:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Luca Bruno 9e1ab43459 gnome3: Add cantarell fonts. Closes #4633 2014-10-24 11:50:47 +02:00
Luca Bruno e553e27f48 kde installer: Add gparted, nixos manual and konsole in the desktop 2014-10-23 18:59:25 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Jascha Geerds 83ae3042a7 kde4: Use plasma-nm instead of knetworkmanager 2014-10-22 13:27:19 +02:00
Georges Dubus 50be0d5447 Removed the kde4_next nixos module 
Merged its differences into kde4. This commit fixes #4519.
 2014-10-21 14:04:28 +02:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Michael Raskin 2ef0a17561 Merge pull request #4387 from 1126/refactor-stumpwm 
stumpwm: update and refactoring
 2014-10-13 17:50:46 +04:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Vladimír Čunát e4436ad841 FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf 
Any reasonably new version of fontconfig does search that path by default,
and setting this globally causes problems, as 2.10 and 2.11 need
incompatible configs.

Tested: slim+xfce desktop, chrootenv-ed steam.
I have no idea why we were setting the global variable;
e.g., neither Fedora nor Ubuntu does that.
 2014-10-05 17:05:27 +02:00
_1126 7536d41287 stumpwm: update and refactoring 
This commit updates the stumpwm to version 0.9.8. Futhermore, it
refactors the expression quite a lot:

* stumpwm has been moved from lisp modules to window-managers.
* stumpwm has been added to the window managers NixOS knows about, this
  enables the user to add stumpwm as a default window manager in his
  NixOS configuration like with Xmonad or i3.
* the package has been split into stumpwm and stumpwmContrib. This is
  due to the fact that development of stumpwm and its extension modules
  has been split into two repositories. As of today, the release is the
  last one before this split. This split into two packages only reflect
  those upcoming upstream changes already.

It is planned to make the addition of the extension modules voluntarily,
like with Xmonads option "enableContribAndExtras". Furthermore it might
be possible to add an option to compile stumpwm with clisp instead of
sbcl.
 2014-10-05 14:50:08 +02:00
Eelco Dolstra 97220c973f Replace hasAttr/getAttr calls with the ? and . operators 
For NixOS evaluation, this gives a ~21% reduction in the number of
values allocated and a ~4% speedup. It's also more readable.
 2014-10-05 01:11:06 +02:00
ambrop7@gmail.com bea503ec36 kde: Allow kde_next as a desktop environment 
This is the same as
93fda9e353
 2014-09-24 23:50:23 +02:00
Luca Bruno 8ef7b83ca7 Fix nixos-rebuild evaluation 2014-09-23 14:01:25 +02:00
Mateusz Kowalczyk 1ffe41b34f Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs 2014-09-22 01:27:00 +01:00
AndersonTorres 9c25f350a8 Ratpoison: updated for 1.4.8 
Also, adding the infamous service file

Closes #4192
 2014-09-21 20:05:12 +01:00
AndersonTorres 90fcd66599 AfterStep (version 2.2.12): New Package 
AfterStep is a beautiful window manager, inspired by NEXTStep interface

Closes #4177
 2014-09-21 00:03:44 +01:00
AndersonTorres c6f28f988c Windowmaker: adding system service file, and a long description 
Closes #4066
 2014-09-20 23:36:07 +01:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Eelco Dolstra ec4f38c56f Manual: Remove some option defaults that refer to store paths 
Option defaults should not refer to store paths, because they cause
the manual to be rebuilt gratuitously. It's especially bad to refer to
a highly variable path like a computed configuration file.
 2014-09-18 16:21:26 +02:00
lethalman 3224b32e64 Merge pull request #4101 from ts468/e19 
Add package: Enlightenment E19!!!!
 2014-09-16 16:13:56 +02:00
Thomas Strobel 1613d6cca6 Add package: Enlightenment E19! 
Wayland desktop shell is not enabled, yet.
 2014-09-15 23:34:28 +02:00
Matej Cotman 99a46a0eca set network manager as default true 2014-09-12 13:52:26 +02:00
Luca Bruno e4e39f26ba Change default from gnome 3.10 to gnome 3.12 2014-09-08 18:35:45 +02:00
Nathaniel Baxter c16874c4c0 ati_unfree: Create a nixos module for the ati_unfree x11 driver and 
blacklist the radeon driver when ati_unfree is installed.
 2014-09-07 12:40:32 +10:00
Michael Raskin a3b9bf6c87 Merge pull request #3653 from iyzsong/nixos/xfce4-mixer 
nixos: don't set variables for gstreamer-0.10 (fix #3652)
 2014-09-04 20:54:57 +04:00
Suvash Thapaliya 9073a30cee Add extraConfig option for SLiM 
so that various configuration options can be set without having to
expose every single configurable parameter
 2014-08-31 03:21:37 +02:00
aszlig 8a56a55bb4
nixos/manual: Use literalExample when feasible. 
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.

Thanks to @devhell for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-27 23:41:15 +02:00
AndersonTorres 49fcac0d6b Fluxbox: adding system support (as a module) 2014-08-21 07:03:37 -03:00
宋文武 35945027bf nixos/xfce: don't set a bloated GST_PLUGIN_PATH 2014-08-19 09:32:07 +08:00
Luca Bruno 3d0dc6a143 gnome3: add services.xserver.desktopManager.gnome3.sessionPath 
Used to add GI_TYPELIB_PATH and LD_LIBRARY_PATH for gnome shell extensions
or other libraries and services.

Not a great solution but may be the start for further work. Let's make
some cool packages work for now.
 2014-08-14 21:16:40 +02:00
Matt Miemiec 8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Luca Bruno 1a29fcae69 gdm: Add very experimental display manager 2014-08-12 11:23:42 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Luca Bruno 769ab3a218 nixos synaptics: allow null value for accelFactor, minSpeed and maxSpeed 
Some desktop managers like GNOME are able to tweak the speed
of the mouse or synaptics at runtime with good defaults.
 2014-08-04 13:42:27 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Shea Levy 7fec575976 Fix lib functions taken from pkgs.lib instead of lib in nixos 2014-08-01 16:23:56 -04:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Matej Cotman 5b97751a8f fix e18 cpufreq module: set setuid to freqset 2014-07-25 12:49:31 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Vladimír Čunát 644c9eb6f7 Revert "Merge #3054: add kde 4.13.2" 
This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e, reversing
changes made to 07a09fbe63.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
 2014-07-22 17:48:14 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Matej Cotman 1afb26fb17 e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00