JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
220,253 Commits 2 Branches 0 Tags 13 GiB
6c5983a291
Commit Graph

642 Commits

Author SHA1 Message Date
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
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
Jascha Geerds
3d9a4d79cf gnome3: Include gnome-shell-extensions in session path 2015-07-24 12:41:20 +02:00
Thomas Tuegel
0aa8e64967 kde5: JSON manifest format 2015-06-25 09:03:40 -05: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
Luca Bruno
db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Edward Tjörnhammar
1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02: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
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
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
Luca Bruno
f7b26bf98f gnome3: Set XCURSOR_PATH. Closes #6191 2015-02-11 11:48:51 +00: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
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
Evgeny Egorochkin
87610ca0fd kde4: enable akonadi by default 2014-12-19 08:59:22 +02: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
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01: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
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
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
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +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
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
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
宋文武
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
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
Matej Cotman
5b97751a8f fix e18 cpufreq module: set setuid to freqset 2014-07-25 12:49:31 +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
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
Wout Mertens
ab184b3388 kde: Allow kde_next as a desktop environment 2014-06-22 19:28:18 +02:00
Luca Bruno
a013d00448 nautilus-sendto: new package 
Integrates Evolution and Pidgin into the Nautilus file manager
 2014-05-28 17:27:48 +02:00
Luca Bruno
bf6ddc6285 nautilus 3.12: find extensions 2014-05-28 17:27:48 +02:00
Luca Bruno
6b21186742 gnome 3.12: make remote desktop sharing work 2014-05-26 17:18:04 +02:00
Luca Bruno
2131313fa6 Add gvfs dbus service and gvfs gio modules to gnome 3 
Closes #2746
 2014-05-26 11:13:51 +02:00
Bjørn Forsman
15beb4054d nixos: add 'gvfs' when using GNOME3 desktop 
One reason for adding this is to make Chromium able to open files it has
downloaded.

Currently this happens:
  /run/current-system/sw/bin/xdg-open: line 364: gnome-open: command not found

(And nothing happens in the GUI when clicking a downloaded file.)

Looking into xdg-open, one can see that it first tries to run gvfs-open
and then falls back to gnome-open. Adding 'gvfs' makes the first command
succeed.
 2014-05-25 14:17:36 +02:00
Luca Bruno
6e13cc82df Override glib_networking with gnome 3.12 scope 2014-05-21 13:40:35 +02:00
Luca Bruno
df95a8cc2f upower: add 0.99 version for gnome 3.12 2014-05-20 13:41:39 +02:00
Luca Bruno
f07fd89111 Allow specifying the gnome3 packages to use for the xserver service 2014-05-20 13:41:39 +02:00
Luca Bruno
4ca985a7e3 bijiben: new package 
Note editor designed to remain simple to use

https://wiki.gnome.org/Apps/Bijiben
 2014-05-02 17:43:18 +02:00
Luca Bruno
b3fe998fdb gnome-clocks: new package 
Clock application designed for GNOME 3

https://wiki.gnome.org/Apps/Clocks
 2014-05-02 16:04:57 +02:00
Luca Bruno
fbfccea0e8 geoclue2: add dbus service 2014-05-02 16:04:57 +02:00
Luca Bruno
4229053cb0 gnome-photos: new package 
Photos is an application to access, organize and share your photos with GNOME 3

https://wiki.gnome.org/Apps/Photos
 2014-05-02 16:04:57 +02:00
Luca Bruno
d6206ccceb evolution: new package 
Personal information management application that provides integrated mail,
calendaring and address book functionality

https://wiki.gnome.org/Apps/Evolution
 2014-05-02 16:04:57 +02:00
Eelco Dolstra
e6b5c0121f Obsolete fonts.extraFonts 
You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.
 2014-04-29 12:34:57 +02:00
Luca Bruno
3ccf8e1ba2 gnome-documents: new package 
Document manager application designed to work with GNOME 3

https://wiki.gnome.org/Apps/Documents
 2014-04-22 22:17:21 +02:00
Luca Bruno
737fc27473 gnome-music: new package 
Music player and management application for the GNOME desktop environment

https://wiki.gnome.org/Apps/Music
 2014-04-22 22:17:20 +02:00
Luca Bruno
f6159b9095 seahorse: new package 
Application for managing encryption keys and passwords in the GnomeKeyring

https://wiki.gnome.org/Apps/Seahorse
 2014-04-22 22:17:20 +02:00
Luca Bruno
a4ef8dd634 gnome3: prioritize nautilus when opening inode/directory 2014-04-22 22:17:20 +02:00
Luca Bruno
bfbdbc19eb gedit: new package 
Official text editor of the GNOME desktop environment

https://wiki.gnome.org/Apps/Gedit
 2014-04-22 22:17:19 +02:00
Eelco Dolstra
19e9d25e8f Remove KDE 4.11 2014-04-21 18:13:17 +02:00
Eelco Dolstra
4e8c2f0ff9 Merge branch 'systemd-update' 2014-04-20 19:31:01 +02:00
Eelco Dolstra
37d5e9c455 Temporary fix for installer tests 
http://hydra.nixos.org/build/10455979
 2014-04-20 01:53:11 +02:00
Luca Bruno
1942d9cadc gnome-control-center: find gnome-shell search providers 2014-04-17 17:32:20 +02:00
Luca Bruno
eddb702c96 gnome3: enable pulseaudio by default 2014-04-16 18:27:35 +02:00
Domen Kožar
3a9f28ee08 Merge pull request #2185 from lethalman/gnome3 
tracker, licenses.cc-by-30, gnome-user-docs, upgrade sushi, gnome-keyring service, gnome-user-share, gnome-tweak-tool, gnome-shell-extensions, xdg-user-dirs
 2014-04-16 18:08:00 +02:00
Luca Bruno
92a831a4ec xdg-user-dirs: new package 
A tool to help manage well known user directories
like the desktop folder and the music folder

http://freedesktop.org/wiki/Software/xdg-user-dirs
 2014-04-16 15:02:27 +02:00
Luca Bruno
b3a9cc1725 gnome3: add gnome-menus and shared_mime_info packages to find applications 2014-04-15 00:15:20 +02:00
Luca Bruno
fd900f2f8a gnome3: add gtk3 to system packages for gtk-update-icon-cache 
Updating the icon-cache lets gnome-shell show app icons in the activity
 2014-04-14 17:19:38 +02:00
Eelco Dolstra
29027fd1e1 Rewrite ‘with pkgs.lib’ -> ‘with lib’ 
Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem.
 2014-04-14 16:26:48 +02:00
Luca Bruno
b80925a19e empathy: find gsettings schemas, enable in gnome3, disable parallel build 
Enabling by default on gnome3 as now it's possible to create and use
accounts (tested with telepathy_gabble and gtalk).

At this time, empathy x86-64 fails to build on hydra but I'm unable
to reproduce. Therefore, try disabling the parallel build.
 2014-04-14 13:25:59 +02:00
Luca Bruno
997b4898b5 gnome-shell-extensions: new package 
Modify and extend GNOME Shell functionality and behavior

https://wiki.gnome.org/Projects/GnomeShell/Extensions
 2014-04-14 09:58:04 +02:00
Luca Bruno
3cc07a44bc gnome-tweak-tool: new package 
A tool to customize advanced GNOME 3 options

https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
 2014-04-14 09:58:04 +02:00
Luca Bruno
c6383af311 gnome-online-accounts: add dbus service 2014-04-14 09:58:04 +02:00
Luca Bruno
add4977a91 system-path, gnome3: run update-desktop-database to create the mime cache 
This allows programs such as yelp to handle help:// protocol schemas
 2014-04-14 09:58:03 +02:00
Luca Bruno
a5b4c74a16 gnome-user-share: new package 
Service that exports the contents of the Public folder in your home directory on the local network

https://help.gnome.org/users/gnome-user-share/3.8
 2014-04-14 09:58:03 +02:00
Luca Bruno
191c4b6145 gnome3: make extensions.gnome.org recognize the gnome desktop 2014-04-14 09:58:03 +02:00
Luca Bruno
b0154961ed gnome-keyring: add dbus service 2014-04-14 09:58:03 +02:00
Luca Bruno
9d5a06cfe7 gnome3: use package names for environment.gnome3.excludePackages 2014-04-14 09:58:03 +02:00
Luca Bruno
87284dd9e9 sushi, telepathy: make enabling the service overridable 2014-04-14 09:58:02 +02:00
Luca Bruno
b4096479fa gnome-user-docs: new package licensed under the new licenses.cc-by-30 
User and system administration help for the Gnome

https://help.gnome.org/users/gnome-help/3.10
 2014-04-14 09:58:02 +02:00
Luca Bruno
d5b4c3c63e tracker: new package 
Desktop-neutral user information store, search tool and indexer

https://wiki.gnome.org/Projects/Tracker
 2014-04-14 09:58:02 +02:00
Luca Bruno
a3115707dd Add environment.gnome3.excludePackages 
Give the user a full desktop, and the possibility to exclude
non-base packages from the default list of packages.
 2014-04-09 00:36:53 +02:00
Luca Bruno
c56af6102a at-spi2-core: add dbus module, enabled on gnome3 by default 2014-04-09 00:36:53 +02:00
Luca Bruno
8553993887 telepathy-mission-control: add dbus service, enabled by default on gnome3 2014-04-09 00:36:52 +02:00
Luca Bruno
2bc0f7b701 evolution-data-server: fix gsettings schemas and add dbus service 2014-04-09 00:36:51 +02:00
Luca Bruno
ea3644cb09 sushi: new package 
A quick previewer for Nautilus

http://en.wikipedia.org/wiki/Sushi_(software)
 2014-04-08 13:41:29 +02:00
Luca Bruno
06614031d6 accountservice: add dbus and systemd services 
Enable by default with gnome3.
 2014-04-08 13:39:48 +02:00
Luca Bruno
5174e6db80 gnome-backgrounds: new package 2014-04-06 15:23:11 +02:00
Luca Bruno
671e346eb2 gnome3: add glib-networking gio modules 
With glib-networking, epiphany and other gnome apps
can access https and other networking protocols.
 2014-04-04 23:45:06 +02:00
Eelco Dolstra
6e086caa8a xterm: Don't enable unless X11 is enabled 2014-04-03 20:44:57 +02:00
José Romildo Malaquias
47c7e29ffa make environment.variables.GIO_EXTRA_MODULES a list 
Close #1929.
 2014-03-19 22:15:44 +01:00
Domen Kozar
28069d6aad move windowManager.xbmc to desktopManager.xbmc 2014-03-12 09:20:59 +01:00
Pascal Wittmann
c2fcf07f06 Use feh only as a fallback if the xserver is actually enabled. 
Otherwise feh is installed even though no xserver is available.
 2014-03-04 09:10:23 +01:00
Domen Kožar
ad0732313d gnome3: typo 2014-02-19 16:53:08 +01:00
Domen Kožar
746c42d10f gnome3: add some default core packages to be installed 2014-02-19 16:38:42 +01:00
Domen Kožar
189273af38 add gnome3.vino 2014-02-19 16:38:41 +01:00
Domen Kožar
4b201b27bf gnome3: correctly place GIO_EXTRA_MODULES 2014-02-17 00:24:13 +01:00
Domen Kožar
e24b01f615 desktop-manager.gnome3: add dconf support 2014-02-16 21:37:18 +01:00
Domen Kožar
5ffab7710d gnome3.gnome_control_center: build and fix runtime deps 2014-02-08 12:30:23 +01:00
Domen Kožar
506a030b91 gnome3: add missing files 2014-02-07 00:37:17 +01:00
Domen Kožar
65a28e8b73 Add gnome3 desktop manager. Very experimental. 
Currently very basic gnome-shell launches on my laptop. Quite some
services won't start yet, most notable is gnome-control-center.

GTK3 apps still don't have theming applied and for example launching
chromium results in horrible red windows.
 2014-02-07 00:31:29 +01:00
Domen Kožar
15fb296b43 xfce: partially add gtk3 support 2014-02-07 00:30:21 +01:00
Jaka Hudoklin
78d3180dbe xfce: add xfce screenshooter 2014-01-13 10:55:18 +00:00
Vladimír Čunát
c33c2e68e4 xfce4notifyd: minor update, add to the default installation 2013-11-18 21:08:25 +01:00
Sergey Mironov
d8b0c942a1 xfce: enable tumbler the thumbnail manager (close #1206) 2013-11-16 16:58:08 +01:00
Domen Kožar
a734f32fa1 Remove desktopManager.gnome 
Gnome doesn't work at least since I started using NixOS half a year
ago, let's not give wrong impressions to newcomers. Packaging gnome3
is still something on horizon.
 2013-11-04 18:12:38 +01:00
Eelco Dolstra
7d5152964c Drop environment.x11Packages 
It doesn't do anything useful compared to environment.systemPackages.
 2013-10-30 18:47:43 +01:00
Eelco Dolstra
408b8b5725 Add lots of missing option types 2013-10-30 18:47:43 +01:00
Eelco Dolstra
db2a9afb75 Remove obsolete xfceutils attribute 2013-10-30 15:35:09 +01:00
Eelco Dolstra
862e3dd977 Substitute "types.uniq types.string" -> "types.str" 2013-10-30 14:57:42 +01:00
Eelco Dolstra
30a36f9a80 Remove remaining uses of mkOverrideTemplate 2013-10-28 22:45:58 +01:00
Eelco Dolstra
d5047faede Remove uses of the "merge" option attribute 
It's redundant because you can (and should) specify an option type, or
an apply function.
 2013-10-28 22:45:56 +01:00
Eelco Dolstra
a2c820c678 Turn security.pam.services into an attribute set 
That is, you can say

  security.pam.services.sshd = { options... };

instead of

  security.pam.services = [ { name = "sshd"; options... } ];

making it easier to override PAM settings from other modules.
 2013-10-15 14:47:51 +02:00
Eelco Dolstra
5c1f8cbc70 Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00