Commit graph

423 commits

Author SHA1 Message Date
Luca Bruno eccd68eeb7 gnome3: add bgSupport=true. Closes #10242 2015-10-06 10:21:38 +02:00
Chris Martin f8581a5a95 synaptics: add scrollDelta option 2015-09-29 19:06:49 -07:00
Chris Martin de88ff9912 synaptics: add palmDetect tuning options 2015-09-29 19:06:49 -07:00
Eelco Dolstra 1b728846a8 Shut up a KDE warning when a user first logs in
It was complaining about not having write permission to
$HOME/.local/share/user-places.xbel (because .local/share didn't exist
yet).
2015-09-28 15:14:44 +02:00
Eelco Dolstra 89e983786a Manual: Remove store path references 2015-09-24 11:50:58 +02:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Bryan Gardiner d42fbef595
xf86-input-synaptics: make use of 50-synaptics.conf
The default synaptics functionality (without this file) is limited for
clickpads: the right soft button area in the bottom right isn't active by
default, so the entire pad generates left-clicks.  There is no way to
right-drag.

This file defines soft button areas and provides some matching rules.
These settings don't conflict with the synaptics options that NixOS
provides.
2015-09-18 07:16:52 -07:00
Vladimír Čunát 485ea9a621 xf86_video_nouveau: deprecate this alias 2015-09-17 09:11:18 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Luca Bruno c94a625585 nixos gdm: use AutomaticLogin if delay is zero. Closes #9843 2015-09-14 08:48:53 +00:00
Luca Bruno 6644af5910 nixos gdm: add debug option 2015-09-14 08:33:44 +00:00
Profpatsch 85898da27a Remove desktopManagerHandlesLidAndPower
As discussed on https://github.com/NixOS/nixpkgs/pull/9642, the option
is not necessary because all desktop managers already stopped handling
it (and delegated to systemd).
2015-09-08 18:12:17 +02:00
Tobias Geerinckx-Rice 24048fa226 nixos: redshift module: add package option
...and make code more consistent.
2015-09-06 23:50:02 +02:00
Bjørn Forsman 41ae7e00d7 nixos/gdm: simplify assert expression 2015-09-05 10:23:43 +02:00
lethalman 8bfacda44c Merge pull request #9642 from Mathnerd314/power-fix
Remove desktopManagerHandlesLidAndPower
2015-09-04 18:09:51 +02:00
Mathnerd314 13a314ec17 Remove all explicit assignments of desktopManagerHandlesLidAndPower 2015-09-04 09:34:15 -06:00
Bjørn Forsman b716673f97 nixos/gdm: add assertion for the autoLogin.user option
Or else users may see this unfriendly message:

  error: cannot coerce null to a string, at .../nixos/modules/services/x11/display-managers/gdm.nix:107:49
2015-09-03 22:30:07 +02:00
Bjørn Forsman 833b4c34c2 nixos/gdm: fix description typo 2015-09-03 22:30:07 +02:00
Eelco Dolstra f223448d5d Shorten inhibit message
This also makes it consistent with KDE's inhibit message.
2015-09-03 13:03:14 +02:00
Eelco Dolstra 882b2465c2 Remove ad hoc README
It's unlikely that people will see this file, so it's kind of
pointless.
2015-09-03 13:03:14 +02:00
Kovacsics Robert (NixOS-SSD2) 553e7d49ff wmii service: refactor to use wmii_hg 2015-09-03 12:58:11 +02:00
Profpatsch 44c12dc0ff desktopManagerHandlesLidAndPower default false`
Changes the option and explicitely sets it for each desktopManager.

Reasoning: Currently,
services.xserver.displayManager.desktopManagerHandlesLidAndPower is set
to true by default. This creates a problem for users without desktop
environments activated, since lid management simply doesn't work
(and they have to be lucky to find this option).

See issue #9671
2015-09-01 12:14:44 +02:00
Vladimír Čunát b92c4a51e6 desktop and xmonad wrappers: preferLocalBuild
Also no substitution.
2015-09-01 09:43:37 +02:00
Luca Bruno d7d619f2cb nixos gdm: fix enable description 2015-08-28 10:36:25 +02:00
Edward Tjörnhammar 7f3566da8a services.xserver.displayManager.gdm.autoLogin: add description 2015-08-28 05:55:56 +02:00
Luca Bruno 6eb096900f nixos gdm: support autologin 2015-08-27 18:11:39 +02:00
Luca Bruno 36f4e0e2e7 gnome3: set desktopManagerHandlesLidAndPower to false 2015-08-13 01:39:52 +02:00
Jascha Geerds 2c9a97ee14 gnome3: Refactor default screensaver setting 2015-07-30 18:05:42 +02:00
Jascha Geerds 97dd0dae74 gnome3: Set nixos desktop background and screensaver 2015-07-30 17:56:01 +02:00
Kamil Chmielewski 2cf8d9b0ef xserver: qtile as windowManager 2015-07-30 07:31:53 +02:00
Luca Bruno 203dad10fe Revert "Merge pull request #9034 from kamilchm/qtile-wm"
This reverts commit 27c73e252a, reversing
changes made to 9430294114.
2015-07-29 12:30:01 +02:00
Kamil Chmielewski 68976a15e8 xserver: qtile as desktopManager 2015-07-28 23:39:57 +02:00
Vladimír Čunát dbe12b643f nixos/xfce: replace old gnome2 icons by gnome3 2015-07-28 17:05:08 +02:00
Mateusz Kowalczyk 4984bfe807 redshift: fix evaluation
Broken by 77d33f77d7 , cc @nckx
2015-07-27 16:46:57 +01:00
Tobias Geerinckx-Rice 77d33f77d7 nixos: redshift service: add extraOptions 2015-07-27 01:54:07 +02:00
Arseniy Seroka adedca45d5 Merge pull request #8994 from AndersonTorres/icewm
IceWM: 1.3.8 -> 1.3.10
2015-07-26 20:04:54 +03:00
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