about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Add a new module and test for gpg-agentaszlig2016-04-028-0/+860
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since NixOS/nixpkgs@5391882 there no longer is the option to start the agent during X session startup, which prompted me to write this module. I was unhappy how GnuPG is handled in NixOS since a long time and wanted to OCD all the configuration files directly into the module. Unfortunately, this is something I eventually gave up because GnuPG's design makes it very hard to preseed configuration. My first attempt was to provide default configuration files in /etc/gnupg, but that wasn't properly picked up by GnuPG. Another way would have been to change the default configuration files, but that would have the downside that we could only override those configurations using command line options for each individual GnuPG component. The approach I tried to go for was to patch GnuPG so that all the defaults are directly set in the source code using a giant sed expression. It turned out that this approach doesn't work very well, because every component has implemented its own ways how to handle commandline arguments versus (default) configuration files. In the end I gave up trying to OCD anything related to GnuPG configuration and concentrated just on the agent. And that's another beast, which unfortunately doesn't work very well with systemd. While searching the net for existing patches I stumbled upon one done by @shlevy: https://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029092.html Unfortunately, the upstream author seems to be quite anti-systemd and didn't want to accept that into the upstream project. Because of this I went for using LD_PRELOAD to pick up the file descriptors provided by the systemd sockets, because in the end I don't want to constantly catch up with upstream and rebase the patch on every new release. Apart from just wrapping the agent to be socket activated, we also wrap the pinentry program, so that we can inject a _CLIENT_PID environment variable from the LD_PRELOAD wrapper that is picked up by the pinentry wrapper to determine the TTY and/or display of the client communicating with the agent. The wrapper uses the proc filesystem to get all the relevant information and passes it to the real pinentry. The advantage of this is that we don't need to do things such as "gpg-connect-agent updatestartuptty /bye" or any other workarounds and even if we connect via SSH the agent should be able to correctly pick up the TTY and/or display. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Move VirtualBox to dnyarri onlyaszlig2016-03-212-2/+1
| | | | | | | Actually this is the *only* machine where I actually use VirtualBox, on every other machine I'm fine with qemu/KVM. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Use full source info for nix-replaszlig2016-03-211-2/+4
| | | | | | | | Using overrideDerivation on fetchFromGitHub is going to only override the attributes from fetchzip, because fetchFromGitHub isn't directly overridable. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Fix build of nix-replaszlig2016-03-211-0/+8
| | | | | | | | As of edolstra/nix-repl@8a2f5f0, this won't build with current nixUnstable (version 1.12pre4509_69f28eb) and it already has been fixed upstream (edolstra/nix-repl#25 and edolstra/nix-repl@ff8d069). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add "wine" to systemPackagesaszlig2016-03-211-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* fliewatuet: bumlebee, unison, gimplukasepple2016-03-201-0/+4
|
* machines/katara: myPkgs improvementsProfpatsch2016-03-182-3/+47
| | | | | python runtime dependencies a new patch for taffybar
* machines/katara: misc programsProfpatsch2016-03-182-3/+4
|
* machines/katara: remove temporary libreofficeProfpatsch2016-03-181-13/+2
|
* machines/katara: keybase & miscProfpatsch2016-03-181-4/+4
|
* machines/katara: remove obsolete optionProfpatsch2016-03-181-1/+0
|
* machines/katara: finally add cabal to envProfpatsch2016-03-181-0/+2
|
* modules/starbound: Fix setting serverUsersaszlig2016-03-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | Not a big deal because Starbound ignores unknown nodes, but having something like this in the resulting config file is a bit ugly: { "serverUsers" : { "user1" : { "_module" : { "args" : { "name" : "user1" }, "check" : true }, "admin" : false, "password" : "passwd1" } } } Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Fix non-existing <value/> tagaszlig2016-03-151-2/+3
| | | | | | | Docbook XSL doesn't have such a tag and it really should be <literal/> instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Exclude game tests from Hydra jobsaszlig2016-03-152-2/+4
| | | | | | | We can't possibly test those on Hydra, so let's exclude them from the release.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Provide description for usersaszlig2016-03-151-0/+4
| | | | | | Geesh, forgot to add it in b5ef6a6f32ebed51255918ed100c12e8dfa165c6. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Provide defaultText for packageaszlig2016-03-151-0/+1
| | | | | | | We don't want to evaluate the package while building the manual, so let's provide a defaultText instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Avoid trying to build games on Hydraaszlig2016-03-151-1/+2
| | | | | | | | | | The packages in vuizvui.games use the NixOS module system for configuration and provides the particular game derivations based on that. As the configuration is all about Steam/Humblebundle account credentials we obviously can't build it on Hydra and it thus fails with an evaluation error. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add new Starbound service and testaszlig2016-03-154-0/+439
| | | | | | | | | | | | | | | | | | | | | Very preliminary and doesn't have all the option descriptions right, nor does it have convenience features such as setting allowAdminCommands based on whether any users are defined with admin privileges. Of course the latter needs to undergo the decision on how to handle RCON connections, because the latter *might* need that option. But apart from that single option, there are a lot more options we need to flesh out. Also, the test currently is very limited and only spins up a client, connects to the server and does a movement (just walk to the right). Needless to say, it's even quite fragile and relies on OCR to properly detect the custom pixel fonts from Starbound. Which unfortunately fails most of the time. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* games/starbound: Properly handle -bootconfig argaszlig2016-03-151-25/+64
| | | | | | | | | | | | | | | First of all, we need to create another wrapper around the command line arguments, because Starbound will bail out whenever there is more than one -bootconfig argument. In addition, we are now putting in build time information into $out/etc/sbboot.config so we can easily re-use them, for example for a NixOS service module. Also, the hasBootconfigArg is now used for all flavors, because even the stable version supports that argument already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* 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
|\
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-25 02:07:33 +0000