about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* default.nix: Just make an alias to ./machinesaszlig2016-02-081-4/+3
| | | | | | | | | | | | | Suggestion by @Profpatsch to introduce consistent behaviour of the top- level expression so we can now use: nix-build '<vuizvui>' -A machines.aszlig.tishtushi.build .. the same way as: nix-build '<vuizvui/machines>' -A aszlig.tishtushi.build Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-machine: Introduce .build shortcutaszlig2016-02-083-6/+8
| | | | | | | | | | | | | | | | | | | The shortcut is mainly to make things a bit easier, instead of: nix-build '<vuizvui/machines>' \ -A aszlig.tishtushi.eval.config.system.build.toplevel We can now do something like this: nix-build '<vuizvui/machines>' \ -A aszlig.tishtushi.build ... in order to get a system store path out of a machine definition. This also fixes an evaluation error in the top-level default.nix. Thanks to @Profpatsch for bringing this to my attention. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profpatsch/katara: packagesProfpatsch2016-02-071-1/+2
|
* schnurrkadse: initlukasepple2016-02-051-0/+111
|
* fliewatuet: bumplukasepple2016-02-051-40/+40
|
* profpatsch/programs: add support for scanningProfpatsch2016-02-043-0/+16
|
* call-machine: Don't patch iso-image.nix anymoreaszlig2016-01-291-12/+7
| | | | | | | | | This reverts commit 3bf7b0dc9d087d7c141f317456e7abdd60ceda2a. Since NixOS/nixpkgs@269f261 there is a separate "nomodeset" boot menu option, so we no longer need this workaround. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/axbo: Re-package with open source codeaszlig2016-01-282-65/+37
| | | | | | | | | | | | | | | | | | | | | | | | | So far I've used the proprietary download and patched it up to work on NixOS. This now goes through the hurdles of trying to package it by building it from source, although there are still some precompiled dependencies used: commons-beanutils-1.8.3 commons-digester3-3.2 jcommon-1.0.20 jfreechart-1.0.16 swingx-all-1.6.4 In order to push this into upstream <nixpkgs> we first need to package these. Another issue which I didn't dig into is that the interface now looks quite ugly. I'm not sure whether it is because of some packaging choices or because we're now at version 3.x and it's supposed to look like this. Nevertheless, the application works and it makes more sense to improve the source package than the patched up binary package. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Fix overriding kernel patchesaszlig2016-01-281-3/+3
| | | | | | | | | | | | | | | | | | | | The commit NixOS/nixpkgs@23f5e3c directly provides kernelPatches to the build attributes and we did an override by passing back the kernelPatches attributes from the result instead of the original arguments. So instead of using the resulting arguments, we simply reinject the kernelPatches attribute from the input arguments. Tested using: nix-instantiate --eval --strict -I nixpkgs=/home/aszlig/nixpkgs -E ' with import <nixpkgs/lib>; let with ((import ./machines {}).aszlig.tishtushi) eval; in map (getAttr "name") eval.config.boot.kernelPackages.kernel.kernelPatches ' Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/katara: Fix evaluation erroraszlig2016-01-281-1/+1
| | | | | | | | | | | The attribute "diffoscopes" doesn't exist in <nixpkgs> and should be "diffoscope" (without "s"). Evaluation tested with: nix-instantiate release.nix -A machines.profpatsch.katara Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: a few more packagesProfpatsch2016-01-271-1/+6
|
* pkgs/bfqsched: Update to version 4.4.0-v7r11aszlig2016-01-262-32/+10
| | | | | | | | | | We can now drop the kernel 4.4 patch and use the upstream version, because kernel 4.4 has been released since quite a while. The names for the patches changed a bit on the BFQ scheduler page but they represent the same commits nevertheless. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Add my PlayStation 2 gamepadaszlig2016-01-261-0/+26
| | | | | | | This one is a PlayStation 2 gamepad connected via USB using some GreenAsia adapter. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add a new gamecontroller moduleaszlig2016-01-262-0/+110
| | | | | | | | This module is for declaratively specifying SDL_GAMECONTROLLERCONFIG, an environment variable used by SDL 2 to map arbitrary controllers to that of an XBox reference controller. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add a small utility to dump joystick GUIDsaszlig2016-01-263-0/+42
| | | | | | | | | | | | SDL 2 has an environment variable called SDL_GAMECONTROLLERCONFIG, which lists button/axis mappings of various game controllers attached to the system. The game controllers are themselves identified using a GUID which is SDL 2 specific and this tool is there to just dump the name of a particular game controller along with the GUID so it's easier to get the GUID. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Add Headcounter Hydra as log serveraszlig2016-01-191-0/+1
| | | | | | | | | | Quite useful for paging logs so that I don't all the time need to either scroll back the buffer (which is also limited so it's not very useful for large builds) or use something like: curl https://headcounter.org/hydra/log/$drvbasename | less Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Directly connect to taaloaszlig2016-01-191-3/+3
| | | | | | | | As I'm moving away the deployment from mmrnmhrm, it's not a very good idea to rely on the deployment machine being up, which also makes it two machines that need to be up in order to build from tishtushi. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/labtop: Fix syntax erroraszlig2016-01-171-1/+1
| | | | | | | | | | Regression introduced by d99fd1ba860dd513508a7460bf139e9ee990a5d3. Fixes the following evaluation error: error: syntax error, unexpected '}', expecting ';', at labtop.nix:110:55 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* thinkpad firmwareOpenlab Labtop2016-01-161-12/+38
|
* profiles/tests: Revert disabling quake3 testaszlig2016-01-161-2/+0
| | | | | | | | | This reverts commit 71d24b28c16fbae58d1ecfeaecf5a26c7ec015da. Evaluation has been fixed upstream at NixOS/nixpkgs@c4de45b and the test should succeed after NixOS/nixpkgs@5caa8ab as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: some more programsProfpatsch2016-01-161-3/+10
|
* katara: set EDITOR env var to vimProfpatsch2016-01-161-0/+2
|
* profiles/tests: Temporarily disable quake3 testaszlig2016-01-151-0/+2
| | | | | | | | | | | | | The Quake 3 demo data have been marked as "unfreeRedistributable" in NixOS/nixpkgs@6b447a3, which causes this test to not evaluate unless we set config.allowUnfree to true. I guess the best solution to fix this upstream is to use something like OpenArena for the Quake 3 tests, because I didn't manage to find anything regarding the demo files and/or whether those are redistributable or not. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Factor out T100HA specific stuffaszlig2016-01-143-5/+23
| | | | | | | | This should go into its own hardware module, so it might be helpful for others as well (especially if we're going to put it into upstream <nixpkgs>). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Put hardware into own namespaceaszlig2016-01-141-1/+5
| | | | | | | | That way we can separate completely hardware-related stuff from things like bootup and kernel, although the lines between kernel and hardware are quite blurry. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add my own custom xpdf configurationaszlig2016-01-144-1/+22
| | | | | | | | | It's only a very handy keybinding for toggling the outline, because it sometimes gets very annoying if you don't want to go full screen but still don't want that outline eating up space (and no, I don't want to reach for the mouse). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Add more printing driversaszlig2016-01-141-0/+1
| | | | | | | For example at the place where I am right now, I need hplip to access the printer. Also, it won't hurt to include gutenprint as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Refine and fix nix optionsaszlig2016-01-141-1/+3
| | | | | | | | | | We actually have 4 cores in this machine, so let's raise maxJobs to 4, as I had in the original hardware-configuration.nix. While at it, using buildCores = 0 should get us more parallelism, which is especially useful for recompiling kernels ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Switch to nix.buildCoresaszlig2016-01-141-1/+1
| | | | | | | | | This option has been there for a long time (since NixOS/nixpkgs@e8dace2), so let's actually use it instead of putting it into extraOptions to make sure we get an error should the option be renamed or removed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Set mount options for rootfsaszlig2016-01-141-0/+7
| | | | | | | Should be more suitable for the MMC flash device and also deactivates access times. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add new managed machine "tyree"aszlig2016-01-132-0/+74
| | | | | | | | | | | | | Currently this is just a somewhat basic configuration, because the hardware (an ASUS T100HA) is going to get us in trouble. For example right now not even the display is working correctly, neither is WiFi, but we're going to fix that real soon[TM] :-) The configuration is pretty much based on the "haenk" config, which this machine will replace once everything is working. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to version 4.4.0-rc8.aszlig2016-01-071-3/+3
| | | | | | This is -rc8 plus 36 commits ahead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: fish as login shellProfpatsch2016-01-061-2/+4
|
* katara: gajim -> poezioProfpatsch2016-01-061-2/+1
|
* katara: new programsProfpatsch2016-01-061-5/+1
|
* Merge branch 'master' of github.com:openlab-aux/vuizvuiProfpatsch2016-01-011-13/+30
|\
| * machines/haenk: Switch to my version of Vimaszlig2016-01-011-2/+4
| | | | | | | | | | | | | | I'm probably the only one using Vim on this machine, so it makes sense to use a sane Vim configuration here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/haenk: Add cdparanoia to systemPackagesaszlig2016-01-011-3/+3
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/haenk: Sort nixpkgs.config attributesaszlig2016-01-011-3/+4
| | | | | | | | | | | | | | It's not alphabetically sorted, but so that it's a little bit easier to read. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/haenk: Fix evaluationaszlig2016-01-011-1/+1
| | | | | | | | | | | | Finger fart, I should have tested this with nix-instantiate. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/haenk: Enable pepper flash for Chromiumaszlig2016-01-011-0/+1
| | | | | | | | | | | | | | Unfortunately there are still too many flash-only sites out there so that we could disable it for non-technical people. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/haenk: Enable PulseAudio everywhereaszlig2016-01-011-10/+15
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/haenk: Override Mesa using LLVM 3.6aszlig2016-01-011-1/+9
| | | | | | | | | | | | | | | | Since NixOS/nixpkgs@3e96b76, LLVM 3.7 is the default for all packages, including Mesa. Unfortunately, the NV44M GPU drivers do not seem to like this very much. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | katara: new programsProfpatsch2016-01-011-1/+5
|/
* katara: haskell packages ++Profpatsch2015-12-281-0/+3
|
* katara: taffybar patchProfpatsch2015-12-273-2/+84
|
* pkgs: show-qr-codeProfpatsch2015-12-273-0/+30
|
* katara: global nixpkgs config as user configProfpatsch2015-12-271-1/+1
|
* katara: pre-build rustcProfpatsch2015-12-271-0/+1
|
* machines/haenk: Fix build of ipw2x00 firmwareaszlig2015-12-271-6/+6
| | | | | | | The upstream SVN repository is no longer available and is now a Git repository, so let's fetch the newest version from that. Signed-off-by: aszlig <aszlig@redmoonstudios.org>