about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Revert VirtualBox kernel patch for version 3.17.aszlig2014-09-203-18/+5
| | | | | | | | | | | No longer needed for VirtualBox 3.16. This reverts the following commits: * 6fc58460ca5d7cce451aaea37ba8051b37c1bc0c * 62e2dce98704681cafe67b06e18d3e5ffa037d88 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* packages: Add mosh, sox and cabalInstall.aszlig2014-09-101-0/+3
| | | | | | | I already had cabalInstall in my packages list before, but I frequently happen to use "cabal init"... Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Fix evaluation of workspaces submodule.aszlig2014-09-101-1/+1
| | | | | | | Didn't look into it in detail, but the submodule type no longer seems to accept module paths directly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common-workstation: Remove createUser attribute.aszlig2014-09-101-1/+0
| | | | | | No longer needed as of NixOS/nixpkgs@1a75958. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel source to version 3.17.0-rc4.aszlig2014-09-101-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel source and configs to v3.17-rc3.aszlig2014-09-033-3/+11
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Fix evaluation.aszlig2014-08-251-3/+3
| | | | | | | Geeesh, of course, we don't have an .override function, if we have patched beforehand. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Dirty hack to patch VirtualBox for kernel 3.17.aszlig2014-08-253-3/+17
| | | | | | | | Really, I haven't even tested if this builds, because a build process is hanging in zombie-"mode" right now. And I really don't want to reboot twice, so let's throw it at Hydra and hope everything works well, right? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs/config: Set allowBroken to true.aszlig2014-08-251-0/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Update to v0.16-rc2.aszlig2014-08-251-2/+11
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm: Remove USB gadget support from kconf.aszlig2014-08-251-38/+0
| | | | | | | Gives a compile error in -rc1 and I really don't need it, so let's remove it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* bfqsched: Update patch for kernel version 3.17.aszlig2014-08-253-18/+43
| | | | | | | | Includes a patch for 3.17-rc1 from: https://groups.google.com/forum/#!topic/bfq-iosched/piEzoNMGmk8 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel source and configs to v3.17-rc1.aszlig2014-08-253-16/+71
| | | | | | Geesh, long time no update so it's about time :-/ Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Really reverse the output of the bars.aszlig2014-08-051-4/+5
| | | | | | | | If using config.vuizvui.i3.reverseHeads we so far only reversed the position in the config file, but actually forgot about reversing the real outputs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Add a default configuration to mpv.aszlig2014-08-051-0/+8
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* packages: Replace mplayer with mpv.aszlig2014-08-051-1/+1
| | | | | | Finally switching to mpv now :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Apply reverseHeads option to bar config.aszlig2014-08-041-8/+10
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.16.0.aszlig2014-08-041-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move all aszligEnv packages to systemPackages.aszlig2014-08-045-121/+66
| | | | | | | | | As we have a build farm at our disposal, it really makes sense to put the whole set of packages + overrides into systemPackages. The new packages list is now sorted by name rather than category so it's easier to spot duplicates. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* envs: Drop all envs except aszligEnv.aszlig2014-08-021-41/+0
| | | | | | As written in 886cf96, we don't need them anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Revert "release: Drop envs attribute."aszlig2014-08-021-0/+4
| | | | | | | | | | | | This reverts commit 886cf96f68172021d0ac9f8fbe32e4085b7487bb. Right now, this is still needed for aszligEnv until we have refactored it to be a proper module. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Conflicts: release.nix
* i3: Check whether configuration file is valid.aszlig2014-08-022-0/+12
| | | | | | | | | | | Finally, after going through quite some journey, we can now check the config file without needing an X connection. The journey took a bit longer, because I was stubborn enough to get the test suite running on Nix (because I wanted to have an upstream test case for this). All that to create a small patch which just checks that damn config file and emits an exit code that actually reflects the output :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Stringify bar config for inner heads.aszlig2014-08-011-1/+1
| | | | | | Fixes evaluation for mmrnmhrm and dnyarri. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Add preliminary test for i3 module.aszlig2014-08-011-0/+4
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Drop envs attribute.aszlig2014-08-011-4/+0
| | | | | | | | I'm not using them anymore, except for the kernel env. And the latter has so few dependencies that even the slowest machine shouldn't need very long to compile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Add preliminary VM test.aszlig2014-08-011-0/+31
| | | | | | | Currently just sleeps for 20 seconds and takes a screenshot. Nothing too fancy yet. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Fix generating config for a single head.aszlig2014-08-011-2/+3
| | | | | | | If there is only one head, we don't need any "workspace" command in the i3 configuration file, so let's omit it entirely. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Use Nix expressions to generate status bars.aszlig2014-08-012-47/+33
| | | | | | | | We might break the dnyarri/mmrnmhrm setup here, but it is mainly for getting rid of the hack to match networking.hostName for a particular node in order to swap heads. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3/conky: Add a new "single" layout.aszlig2014-08-011-0/+13
| | | | | | | This is for machines that don't have multiple heads attached, such as arilou or kzerza. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3/conky: Don't even try to use X for output.aszlig2014-08-011-0/+1
| | | | | | I've already disabled most output types, but just to be sure. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Include modules using module-list.aszlig2014-08-014-2/+10
| | | | | | | This also means that we now have to explicitly enable a certain feature, such as vuizvui.i3 (which is the only module right now). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Remove override for Erlang manpages.aszlig2014-07-291-12/+0
| | | | | | Applied upstream at NixOS/nixpkgs@ec65a1e. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Change namespaces into new project name "vuizvui".aszlig2014-07-295-21/+21
| | | | | | | | | | | | | | | | | | I found "nixconf" a little big too generic and thus not unlikely enough to someday collide with something in <nixpkgs>. That's why I chose the name "vuizvui" as a Bavarion word (actually _two_ words: "vui zvui") for "far too much", in terms of the opposite of "nix" - which means "nothing". A possible downside for choosing this name is that it might be jawbreaker to some English native speakers out there, but I don't really care if the pronunciation is correct nor do I expect to get a lot of public attention on this repository. And yes, for English native speakers, a pronunciation like "fui-tsui" is probably okay as well :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.16-rc7.aszlig2014-07-281-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* network: Add new machine "kzerza".aszlig2014-07-262-0/+66
| | | | | | | This is another USB flash drive that is used for booting directly into GrandPA, currently in use at Rockfabrik Augsburg. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Factor out common workstation options.aszlig2014-07-255-139/+102
| | | | | | | | Those options reside now in common-workstation.nix but it's only a preliminary step, in the long term I guess we want to have this as modular as possible. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add grandpa version 0.5.aszlig2014-07-252-0/+20
| | | | | | | This is going to be needed as the main application for my lighting laptop :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* common: Allow user aszlig to access Enttec widget.aszlig2014-07-251-0/+2
| | | | | | | Probably would be good if there's a way to identify Enttec widgets from other FTDI chips... Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add arilou, an USB pendrive machine.aszlig2014-07-252-0/+48
| | | | | | | | I was keeping this one around for some time, but it's really time to finally add it to my nixconf repository so Hydra builds the machine as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Allow to work only with a single head.aszlig2014-07-251-4/+7
| | | | | | | | This is very ugly and just to be taken as a workaround because the i3 status line will be completely messed up. The main reason for doing this is that the config will evaluate with a single head. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Revert update to latest mercurial branch.aszlig2014-07-223-110/+0
| | | | | | | | | | | | | | | | This reverts commit 83ba20511bf553d2dd395a6fe4af73fc9d86d57c. We now have nbxmpp in upstream <nixpkgs>, so we no longer need it in our own overrides and there was a new tarball release issued upstream just one day after we did that override, so let's move over to using this one instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Conflicts: overrides/default.nix pkgs/gajim/0.16-pre.nix pkgs/nbxmpp/default.nix
* i3: Reverse head assignment for dnyarri.aszlig2014-07-162-1/+13
| | | | | | | | This is because of a limitation of Synergy not being able to cope with multihead assignments. At least not at the time I have implemented it at first, so might be worth to check if it has improved in the meantime. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Make workspace 10 reachable by the 0 key.aszlig2014-07-161-1/+1
| | | | | | There is no "10" key on most keyboards. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Correct package for Yesod scaffolder.aszlig2014-07-161-1/+1
| | | | | | | The scaffolder is now in yesod-bin, so we don't need all that cruft hanging around anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Add nix-prefetch-scripts.aszlig2014-07-161-0/+1
| | | | | | | I'm using these quite frequently, so it really makes sense to put it here by default. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* collections: Remove most Haskell libraries.aszlig2014-07-161-10/+0
| | | | | | | I'm using nix-build for Haskell development for quite some time and thus do not need to keep around that cruft in my environment. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kconf: Enable multiple devpts instances.aszlig2014-07-162-0/+2
| | | | | | | | | | | This is needed in order to run NixOS VM tests, because within the chroot the test driver starts the VDE switch, which in turn relies on posix_openpt() to function correctly. Which unfortunately doesn't, because CONFIG_DEVPTS_MULTIPLE_INSTANCES was not set so far. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Update kernel source to v3.16-rc5.aszlig2014-07-151-3/+3
| | | | | | | Shame on me for running such an old kernel and thanks to @devhell for making me feel guilty. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Add NixOS options to configure workspaces.aszlig2014-07-145-58/+175
| | | | | | | | | | | This allows for a more dynamic workspace assignments, especially when varying between the number of heads. We now not only can use the NixOS module system to set workspaces but also assign applications to them. And the default workspace layout is to evenly spread out the heads among the available heads. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* i3: Move Chromium to workspace 6 on dnyarri.aszlig2014-07-141-2/+2
| | | | | | | This is because I've swapped screens and that wsConfig isn't nice, so we need to refactor it very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>