about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * labtop: Switch to GNOMEOpenlab Labtop2016-02-131-2/+1
| | | | | | | | (test)
| * schnurrkadse: attempt to fix ipw2200 firmwarelukasepple2016-02-131-2/+10
| |
* | machines/katara: keepassx → passProfpatsch2016-02-241-1/+1
|/
* pkgs/games: Remove license and copying infoaszlig2016-02-082-222/+0
| | | | | | | | | | | | | | | We already cover that by the main project so we don't need to go by two different licenses. I've asked @layus whether the license change would be okay for his contributions and he agreed: https://github.com/aszlig/nixgames/pull/1#issuecomment-174551671 Other than that I'm the only author of every other commit and I obviously agree as well :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge aszlig/nixgames into vuizvuiaszlig2016-02-0823-0/+1222
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a subtree merge of the full nixgames repository including history. Right now it isn't linked to vuizvui at all but we're going to do that very soon. The reason why I'm merging both repositories together is that it's easier for me to manage updates and also facilitate contributions by people from the OpenLab. Another reason to merge it is that we can write more generic functions for building both, the games and the rest. Right now the licensing is still the Apache License version 2.0, but we're going to change it to the vuizvui license as well.
| * Merge pull request aszlig/nixgames#1 from @layusaszlig2016-02-084-13/+95
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Unepic to the humblebundle games list and also fixes Bastion, or at least it *should* fix Bastion. I have tested Unepic, though I had to fix the download, which I'm going to commit later. As for Bastion, at least with the humblebundle fetcher it's not able to fetch "bastion_linux" (it doesn't even show up), however on my Humble library I can see the download (maybe it's because I bought this along with HIB 5). Nevertheless, it's at least a small step forward and we need to fix these issues later.
| | * bastion: update (fix?) buildGuillaume Maudoux2015-07-141-11/+48
| | |
| | * unepic: Add unepic at version 1.50.5Guillaume Maudoux2015-07-142-0/+45
| | |
| | * fecthHumbleBundle: Allow to provide real file nameGuillaume Maudoux2015-07-141-3/+3
| | | | | | | | | | | | | | | By overriding the real file name, it is possible to prefetch the game archive with `nix-prefetch-url --type md5 file://<path>/realname`.
| * | steam: Add Starboundaszlig2016-02-082-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comes in two flavors: stable (beta) and unstable (beta), though at the moment, both are the same version. I've renamed prefixed the command names with starbound-... and also converted underscores to dashes to make the commands a bit more consistent. Also, I made room for Mac OS X and Windows so in *theory* it should also work on these platforms. However I only tested it on NixOS with a 64bit Linux. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | Add support for fetching non-DRM Steam gamesaszlig2016-02-084-1/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to the folks at @SteamRE there is a reverse-engineered Steam library and a downloader for Steam depots. The downloader actually uses mcbyte-it/DepotDownloader@5fa6621 which is a fork that has added proper exit codes. We also patch the downloader to show the latest manifest ID, so we can check whether we're up to date. The reason we're pinning the manifest ID is that we make sure that the SHA256 will always match, no matter whether there is a new upstream version or not. Obviously the whole steam/ namespace is only for Steam games that can run without Steam, which in turn is the entire purpose of it. For a list of Steam games without DRM, have a look at: http://steam.wikia.com/wiki/List_of_DRM-free_games Also if you want to look up the depotId or appId, this is a good resource: https://steamdb.info/ Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | humblebundle: Add Lovers In A Dangerous Spacetimeaszlig2016-02-082-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | Yes, they're serious with that name, hence I have abbreviated it to "liads", so you don't have to type something like this: nix-build -A humblebundle.lovers-in-a-dangerous-spacetime Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | fetch-humble-bundle: Escape Python stringsaszlig2016-02-081-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | This fixes aszlig/nixgames#2 but instead of using """ for the strings, we now have a pyStr function which is taking care of escaping nasty characters :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | humblebundle: Add GuacaMeleeaszlig2016-01-252-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comes with an LD_PRELOAD wrapper that is just used for the initial chdir() where the game tries to set its working directory to the data files. After that all loading of the preload wrapper will fail, but that's okay because we just need to set the data directory and be done with it. We also introduce a callPackage_i686 which is equivalent to the one in <nixpkgs> but also adds our own packages to the set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | fetch-humble-bundle: Fix path to ca-bundle.crt.aszlig2015-07-221-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | This has changed twice in upstream <nixpkgs>: * NixOS/nixpkgs@d6cbb061e3bb5d2a93196a4543cfbd7c2359bd84 $out/etc/ca-bundle.crt -> $out/ca-bundle.crt * NixOS/nixpkgs@ffd0539eba473348f752fa8ab1f1f55388634f8f $out/ca-bundle.crt -> $out/etc/ssl/certs/ca-bundle.crt Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Use the NixOS module system for configuration.aszlig2015-04-174-29/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's use the module system to allow specifying things such as HumbleBundle or Steam or $whatnot's usernames and passwords, so we can not only typecheck these options but also modularize it before this whole repository is beginning to get very messy. Right now, if you use the default.nix without a configuration, you'll still get message saying that you may want to supply HumbleBundle credentials, even though it's no longer only about HumbleBundle anymore. Nevertheless, the only tree existing right now is the HumbleBundle one, so never mind about that :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * fetch-humble-bundle: Update to version 0.1.1.aszlig2015-04-161-7/+2
| | | | | | | | | | | | | | The upstream API has changed, so the previous version now no longer works. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Rename stdenv.cc.gcc to stdenv.cc.cc.aszlig2015-04-164-4/+4
| | | | | | | | | | | | This has been changed in NixOS/nixpkgs@48f63c2. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * humblebundle: Allow config file for email/passwd.aszlig2014-12-312-4/+28
| | | | | | | | | | | | | | | | Rather than passing email and password using --argstr to nix-build, we now read them from a config file in XDG_CONFIG_HOME (or ~/.config if unset). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Put Nix expressions under the Apache License 2.0.aszlig2014-12-312-0/+222
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Move everything into /humblebundle/.aszlig2014-12-3112-0/+0
| | | | | | | | | | | | | | We don't just want HumbleBundle games, so let's try to keep the directory structure that way very early. Signed-off-by: aszlig <aszlig@redmoonstudios.org>