about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* pkgs: Hook in games into vuizvui package setaszlig2016-03-153-5/+9
| | | | | | | | | | New we can reference the games using pkgs.vuizvui.games.*, although game configuration currently still resorts to using ~/.config/nixgames.nix if there is no nixpkgs.config.vuizvui.games set. In this vein, this should also avoid Hydra to try to build those games, because those aren't publicly available for free. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* games/starbound: Add desktop itemaszlig2016-03-151-1/+19
| | | | | | Makes it easier for DE users not used to a terminal to start the game. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* games/starbound: Refactor to use JQ for bootconfigaszlig2016-03-151-36/+50
| | | | | | | | | | | | | | | | | | | | | | | While JQ is a beast of its own implementing its own turing complete language, it *is* certainly useful and better than sed to replace path values. Now we have a new bootOverrides attribute set, which is converted into JSON and then merged with the original sbboot.config by JQ at the time we're setting up the XDG_DATA_HOME directory. The reason this is necessary is that we can't use environment variables directly in the boot configuration of Starbound, so we need to write the boot configuration at initialization time with the absolute paths to XDG_DATA_HOME. Another change here is that we now reference the upstream store path directly instead of copying over almost everything to our build result. This has the advantage that we have fewer duplication and thus fewer disk I/O while building. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* games/fetchsteam: Allow to specify a branchaszlig2016-03-151-1/+2
| | | | | | | | Currently this is not useful for anything but just a placeholder because currently the depot downloader isn't able to pick from a particular branch but only fetches based on the manifest ID. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* schnurrkadse: use encrypted root with LVMlukasepple2016-03-131-4/+16
|
* schnurrkadse: bumplukasepple2016-03-111-16/+86
|
* Remove all references to "heinrich"aszlig2016-03-054-199/+1
| | | | | | | | | This was a very old effort to NixOSify "heinrich" which unfortunately didn't happen and I'm not sure whether "heinrich" even exists anymore. The tests were broken anyway, so I doubt anyone would grief over it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-machine: Use a list for FS optionsaszlig2016-03-021-1/+1
| | | | | | | | | | | In NixOS/nixpkgs@edb8991 the version got bumped to 16.09, so fileSystem.*.options no longer takes a plain string. The original change has been introduced in NixOS/nixpkgs@3c5fca9 and we already use it everywhere in vuizvui but not for the ISO image builder yet. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/nixops: Drop patch for NixOS/nixops#407aszlig2016-03-021-5/+0
| | | | | | | | The patch was introduced because there was a breaking nixpkgs commit at NixOS/nixpkgs@cad8957, which later got reverted (NixOS/nixpkgs@f3d94cf), so we no longer need this patch. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Revert "manual: Fix evaluation error"aszlig2016-03-021-1/+1
| | | | | | | | | This reverts commit 6b7b68bd8eae94ffe91b2ae17fbf01045244b43b. The breaking upstream commit has been reverted in NixOS/nixpkgs@f3d94cf, so let's revert it here again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/tests: Fix up upstream test namesaszlig2016-03-011-5/+11
| | | | | | | With NixOS/nixpkgs#13585 landing (NixOS/nixpkgs@f70ec0d) in master, the tests are now named differently, so we need to fix it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* rtl8192cu: Move enableRTL8192cFirmware from tyreeaszlig2016-03-012-1/+1
| | | | | | | | | | | This really is specific to the RTL8192CX chipset and I originally was using this for tyree along with the mainline kernel modules. Unfortunately, I had connection drop outs so I switched to the original Realtek driver, which is now vuizvui.hardware.rtl8192cu, so the firmware is used and should be enabled there as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Enable module for RTL8192CUaszlig2016-03-011-0/+3
| | | | | | | This is temporary until I get the internal SDIO WiFi card to work properly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add hardware module for RTL8192CUaszlig2016-03-012-0/+48
| | | | | | | | It's actually a backport of Realtek's own USB WiFi driver that is not (yet?) in mainline. I'm using this for tyree (the T100HA) because the internal WiFi card isn't recognized by SDHCI yet. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Work around vblank issueaszlig2016-03-011-0/+11
| | | | | | | | | | Essentially forcing DPMS standby and bringing it on again for now mitigates the vblank issue with the I915 driver. Of course in the long term I need to debug this properly, but for now this works consistently so I'll leave it that way. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Switch to linux-next with patchesaszlig2016-03-014-1028/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both of these patches are from the following Google Drive: https://drive.google.com/folderview?id=0B4DiU2o72FbuejQ1S2VZZW5xV2c The meta-keys-asus.patch (which is called just meta-keys.patch in this repository) is used verbatim. However, the baytrail-backlight.4.4.patch (here just backlight.patch) is a rebased version of the patch from the Google Drive with a few modifications by me, which boils down to: * Remove the module parameter force_backlight_pmic, because this module is hardware-specific so we don't actually need to do that (and *if* we want to do that we'd compile it in directly). * Add an unused pipe function argument to vlv_pmic_setup_backlight(). As the backlight patch introduces the functions intel_soc_pmic_readb() and intel_soc_pmic_writeb() which are not available at module link time, I have also added DRM_I915 to be compiled into the kernel. In addition I needed to disable VIDEO_EM28XX and RAPIDIO, because they do not compile with linux-next-20160226 and I didn't bother to provide fixes because it's for hardware that is not existing on the T100HA. Note that I'm using linux-next-20160226 here instead of 20160229 because the latter has some networking I/O issues right now. This makes the backlight, battery status and charging usable on the T100HA and the fixes from the drm-intel-fixes branch are no longer needed because they're already in linux-next-20160229. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Compile in INTEL_SOC_PMICaszlig2016-03-011-0/+1
| | | | | | | | | So far INTEL_SOC_PMIC hasn't been enabled *at* *all* so there wasn't any battery status available nor did it charge while the system was running. Enabling INTEL_SOC_PMIC now solves this issue. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/nixops: Update to latest upstream masteraszlig2016-03-011-2/+7
| | | | | | | Actually, it's the latest upstream master plus one pull request by me (NixOS/nixops#407), which fixes the build of the manual. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* manual: Fix evaluation erroraszlig2016-03-011-1/+1
| | | | | | | | | | | | | | Since NixOS/nixpkgs@cad8957 there is an additional argument to optionAttrSetToDocList, so we need to pass internal _module arguments to that argument (typically _module.check and _module.typeInference) which are used by the type checker to find errors. On Vuizvui however, we don't build the full manual but only Vuizvui-specific options, so we might want to aim for a different approach in the long term rather than duplicating a lot of the manual generation code. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/scanning: Fix module descriptionaszlig2016-03-011-1/+1
| | | | | | | The output is docbook XSL, so we need to properly turn ampersands into entities. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/git: Flesh out type info for Git configaszlig2016-03-011-8/+3
| | | | | | | This now is a little more accurate than providing the name and a propagation of types.unspecified. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs-path: Force path to a string by defaultaszlig2016-03-011-1/+1
| | | | | | | | | | This is particularly useful if you want to evaluate machine configurations with a different version of nixpkgs outside of vuizvui and don't want the whole nixpkgs tree to be imported into the store. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Reported-by: Profpatsch <mail@profpatsch.de> Fixes: #10
* profiles/tests: Update upstream tests.aszlig2016-02-281-3/+12
| | | | | | | | | | | | | | In NixOS/nixpkgs@d4636fa, the nixosPinVersion got removed, so we need to avoid evaluating it. Some other tests were added in the meantime, namely: * PostgreSQL (NixOS/nixpkgs@109ba4c) * Grsecurity (NixOS/nixpkgs@dd18447) * initrd-network (NixOS/nixpkgs@cc925d0) * Mathics (NixOS/nixpkgs@fe8498f) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/katara: different temporary libreofficeProfpatsch2016-02-265-849/+7
| | | | | Uses a custom nixpkgs Github rev clone now instead of copying the files over and having to recompile.
* machines/katare: tmp version of libreofficeProfpatsch2016-02-265-1/+854
| | | | | The newest update isn’t working, this is the commit before that copied over.
* machines/katara: some packagesProfpatsch2016-02-261-1/+5
|
* machines/katara: factor out programming packagesProfpatsch2016-02-261-4/+7
|
* machines/katara: disable firewallProfpatsch2016-02-261-8/+1
| | | | phew
* machines/katara: nmap with guiProfpatsch2016-02-261-1/+1
|
* Merge remote-tracking branch 'origin/master'Profpatsch2016-02-2623-236/+1214
|\
| * machines/labtop: switch to gnome3Openlab Labtop2016-02-241-34/+5
| |
| * hardware/thinkpad: mkDefaultOpenlab Labtop2016-02-241-3/+3
| |
| * machines/tyree: Enable RTL8192c firmwareaszlig2016-02-231-0/+1
| | | | | | | | | | | | It's only a temporary WiFi card until the internal one is working. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/haenk: Machine is obsolete, remove itaszlig2016-02-232-96/+0
| | | | | | | | | | | | | | | | Obsoleted by tyree, even though tyree isn't fully working yet it doesn't make sense to build a lot of stuff just for a machine that doesn't get updated anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * modules/thinkpad: Move into modules/hardwareaszlig2016-02-232-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | We already have a directory just for hardware-specific configuration options and the module option already says "vuizvui.hardware", so it should better be consistent with the directory layout. Tested using: nix-instantiate release.nix -A machines.profpatsch.katara Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
| * machines/tyree: Remove Synaptics supportaszlig2016-02-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | The touchpad isn't recognized correctly (it is however recognized as a "mouse") because of an I2C issue. Of course it doesn't hurt if Synaptics is enabled anyway because it just isn't used, but once we get it working it's better to place this in the hardware module of the T100HA. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/tyree: Switch to using networkmanageraszlig2016-02-231-1/+2
| | | | | | | | | | | | | | After all it's an end user system, so "just edit wpa_supplicant.conf" won't work here ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * hardware/t100ha: Add custom kernel + patchesaszlig2016-02-232-6/+1057
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom kernel has built in modules for the MMC storage and a small patch which is essentially diff of the merge of the "drm-intel-fixes" branch from git://anongit.freedesktop.org/drm-intel against 4.5-rc5. This is the HEAD of what I have merged: https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-fixes&id=9b18572e83bfd5378b3fcff3acf123f7bddf558a Eventually these fixes will hit mainline so we can drop them very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * hardware/t100ha: Rotate the touch screen as wellaszlig2016-02-231-0/+7
| | | | | | | | | | | | | | | | | | This may need some calibration as well, but I don't have a stylus to do it very precisely so I'm leaving this to the defaults because I tried to calibrate it using my monstrous fingers and it got worse than the defaults. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * pkgs/games/starbound: Update to latest unstableaszlig2016-02-231-17/+21
| | | | | | | | | | | | | | This also fixes the date for the stable version, so that it closer matches the steamdb entry. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * hardware/t100ha: Set videoDriver to "intel"aszlig2016-02-231-0/+1
| | | | | | | | | | | | | | We already know the display device for this particular type of hardware, so there is no need to probe different video drivers. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * hardware/t100ha: Rotate monitor in Xorg as wellaszlig2016-02-231-0/+8
| | | | | | | | | | | | | | We already rotate the fbcon display, but we need to make sure we also apply the rotation to the X server. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * aszlig/kernel: Update to latest upstream masteraszlig2016-02-221-3/+3
| | | | | | | | | | | | By coincidence I now got *exactly* the -rc5 tag :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * pkgs/nixops: Update to latest upstream masteraszlig2016-02-151-2/+2
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Use users.users/users.groups instead of extra*aszlig2016-02-159-14/+11
| | | | | | | | | | | | | | It has been renamed since months (NixOS/nixpkgs@14321ae) and users.extra* are now just aliases to users.users and users.groups. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/aszlig: Use lists for filesystem optionsaszlig2016-02-156-18/+9
| | | | | | | | | | | | | | | | | | We had this since NixOS/nixpkgs@3c5fca9 and since the merge of master into closure-size (NixOS/nixpkgs@d039c87) we also have it there, so there is no excuse now to not switch to lists, especially because we already used concatStringsSep on lists anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * mmrnmhrm/dnyarri: Update kernel src/cfg to 4.5-rc4aszlig2016-02-153-40/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geesh, the configuration is getting more and more rotten and it's time to make this in a more generic configuration *very* soon. The configuration does have a lot of cruft in it because it's a bunch of "make oldconfig" iterations and no cleanup in-between. In addition, even if I'd do the cleanup I'd probably want common options to be factored out. But for now let's keep the config as-is until 4.6 comes out and we either play the "make oldconfig" game again or we finally rewrite it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/labtop: Really fix evaluation erroraszlig2016-02-141-1/+1
| | | | | | | | | | | | | | | | I actually forgot to add the "3", this time tested using: nix-instantiate -A machines.labnet.labtop Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/labtop: Fix evaluation erroraszlig2016-02-141-1/+1
| | | | | | | | | | | | Regression introduced by 7e255747e0b6edbf2bfd71edf6fea0d47a35ded6. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/notsure: Enable global nixpkgs configaszlig2016-02-131-0/+1
| | | | | | | | | | | | | | Especially makes sense for a managed machine so the user doesn't need to manually create ~/.nixpkgs/config.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>