about summary refs log tree commit diff
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* modules/starbound: Flesh out safeScripts optionsaszlig2016-08-161-10/+43
| | | | | | | | I'm not sure whether this was a single setting in the configuration file prior to Starbound version 1.0 but it has more settings now that affect how those safety checks are performed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Add "maxTeamSize" optionaszlig2016-08-151-1/+10
| | | | | | This option has been added in the nightly prior to Starbound 1.0. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Remove clear* optionsaszlig2016-08-151-20/+5
| | | | | | | | | | | These options are only a one-off setting that's causing the player and universe files to be cleared on server startup. The service populates all options declaratively while this option is something that IMHO doesn't fall into this category, not to mention I fail to see why this would have an advantage over deleting those files using the command line. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Rename checkAssetsDigestaszlig2016-08-151-3/+3
| | | | | | | | The new option seems to be allowAssetsMismatch and the checkAssetsDigest doesn't seem to be referenced anywhere in the Starbound binaries except within the default configuration templates. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Add option "serverFidelity"aszlig2016-08-151-1/+14
| | | | | | | | This one was a bit difficult to find on the web so I had to ask in IRC (person and channel not to be disclosed here) for what this option does exactly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Remove upnpPortForwardingaszlig2016-08-151-9/+0
| | | | | | | | This option is no longer used in version 1.0.5. I've searched the server binary for anything related to this and in older versions there even was UpnpHolepuncher, which is now gone entirely. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/starbound: Fix creation of boot configaszlig2016-08-151-12/+6
| | | | | | | | | The semantics of the boot configuration has changed in version 1.0 and also in the way we package Starbound, so we no longer need to use jq to mix in our values and can specify the entire bootconfig in the service module. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/tests: Use Starbound from HumbleBundleaszlig2016-08-151-2/+2
| | | | | | | The Steam version is old anyway and since we've reached 1.0 there is no point in extracting it from Steam anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Fix vblank issue early at initrdaszlig2016-08-101-3/+12
| | | | | | | | | | | | | | | Using xset for DPMS control only works as soon as we have an X session, but we want to work around the issue as early as possible so let's set it in preDeviceCommands. The program here directly uses the ioctls to blank/unblank the current console without enums/constants (14 is blank and 4 is unblank) because it's just a workaround and supposed to go away in the near future. If we'd wanted to use the constants from tiocl.h, we'd have to add dependencies on Linux headers, but I'm lazy right now ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Update to Linux 4.7.0aszlig2016-08-072-91/+5
| | | | | | | | | This reverts commit bafb5933654cdb7e35f0c54418bdd0dcb999f98c. We can finally drop that patch, because the issue has been fixed upstream already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* core/tests: Fix evaluation of Go.CD configaszlig2016-08-011-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* core/tests: Improve checks for container configaszlig2016-08-011-4/+7
| | | | | | | | | | | This reverts commit 3f0a9e8002802e5a772b7582f8254c92d7a2a4d5. It's now possible to disable support and tests for containers simply by using config.boot.enableContainers in the machine config, because that's the super option that enables all the container-related services and tools in upstream NixOS and it's also enabled by default. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* core/tests: Add new NixOS testsaszlig2016-08-011-0/+18
| | | | | | New tests are since NixOS/nixpkgs@4f796c28d57887cc9812190bc99fb45b2a. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Fix bad configuration optionsaszlig2016-08-011-4/+4
| | | | | | | | | This was a copy & paste error by me, because I copied the options out of an existing configuration, which contained the CONFIG_ prefixes. Within extraConfig of the generic kernel builder, we only use the names without prefixes. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Revert bootloader workaroundaszlig2016-08-012-30/+0
| | | | | | | | | | | | This reverts commit 9d4575855bf1ae2136d85a2d0aa7b5ede50cfc67. The upstream issue systemd/systemd#3735 has been fixed and it got included in systemd version 331. Since NixOS/nixpkgs@51871dfb3777 we're also on version 331, so we no longer need this patch in Vuizvui. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Bring back temporarily removed Tomahawk referencesaszlig2016-08-011-0/+1
| | | | | | | | | | | | This reverts the following commits: 4f4c778e424e72d51242dbfadde0a2a806efb68b 22fac6bad53e797ca84d7c7ac7e0fca3c0a912c8 We can now move Tomahawk back to the corresponding profiles/machines, because the build has been fixed in f7e934e74595a0d7524159d6faa1b2bb5d. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Optimize the kernel config a bitaszlig2016-08-011-1/+34
| | | | | | | | | | Let's enable the options that *should* work with this kind of hardware regardless whether it's currently working in mainline. It doesn't make a huge difference to the kernel configuration prior to this change, but let's better compile in these options rather than wondering why some hardware isn't working. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Disable imperative containers test for brawndoaszlig2016-07-231-1/+1
| | | | | | | This is to get a first working channel for bootstrapping. Fixing the test is the long-term goal of course, so this is only temporarily. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation/packages: Remove Tomahawkaszlig2016-07-181-1/+0
| | | | | | | Due to bandwidth constraints I'm not using Tomahawk at the moment and I don't have time to investigate the current build failure. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Fix wrong hash for kernel sourceaszlig2016-07-161-1/+1
| | | | | | | | Gah, yes, I'm still waking up and my eyes are not working already... Accidentally copy & pasted tho wrong hash in there. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Update kernel sources + configsaszlig2016-07-161-3/+3
| | | | | | | | | | Nothing very scary here, just getting things up to date. This also reflects on my choices of kernel options, most of them probably are unnecessary but I'm going to rip apart the whole kernel config very soon[TM] anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/labtops/base: shorter grub screenProfpatsch2016-07-151-0/+1
|
* i3/conky: Suppress output to stderraszlig2016-07-131-1/+2
| | | | | | | | | | | | | i3bar seems to close the FD for stderr, so conky will get a broken pipe error when writing error messages to stderr. Of course in the long run it's better to log these errors somewhere where they can be inspected later. But for now, it's better than terminating i3bar altogether, because that's really annoying ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Fix bootup regression in 4.7-rc6+aszlig2016-07-112-0/+84
| | | | | | | | | | | | | | | I didn't use -rc6 directly but a few commits after the tag. Within the mainline merges there was torvalds/linux@45209046c47b93fad. I didn't investigate further why this exactly is a problem other than freezing the machine shortly after the bootloader hands over control to the kernel. Reverting this commit fixes this issue for now until I have time to look into it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Update to latest mainline kernelaszlig2016-07-101-8/+7
| | | | | | | | | Not that this improves anything significant in terms of hardware support, but I'm debugging on the basis of the -next kernels, so it's better to stay on latest mainline for the vuizvui builds (current -next kernels for the last few weeks make the situation even worse). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Fix bootloader keyboard inputaszlig2016-07-102-0/+30
| | | | | | | | | | | This one is tracked upstream at systemd/systemd#3632. I've implemented the workaround proposed by @medhefgo as a patch. As this module is only for a particular hardware, we won't cause troubles for other hardware. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Explicitly enable CONFIG_MATOMaszlig2016-07-101-0/+2
| | | | | | | | | | This adds a few #ifdefs for Atom platforms, however I don't remember what exactly it fixed/changed for the T100HA. Nevertheless it's probably a good idea to optimize for that architecture because we're going to compile our custom kernel anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Associate *.tt with filetype tt2htmlaszlig2016-07-101-0/+1
| | | | | | | | While hacking on Hydra, this gets quite annoying, because all of these template toolkit files don't get properly highlighted whenever I edit them, so I always had to set the file type manually. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Change indentation to 2 spacesaszlig2016-07-101-2/+2
| | | | | | | | | | HTML already is such a verbose markup language, so having 4 spaces just makes it look even more shifted to the right than it's mostly is. And in the past I've already set ts=2 sw=2 in HTML files every time I edited them anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge remote-tracking branch 'origin/master'Profpatsch2016-07-083-2/+69
|\
| * gajim: Add python-axolotl as a runtime dependencyaszlig2016-07-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to run the OMEMO plugin: https://github.com/omemo/gajim-omemo I'm using drvAttrs directly here, so that we can pass propagatedBuildInputs properly to the wrapper (without duplicating the dependencies all over the place). Ideally, this will be fixed in <nixpkgs> but in a much more fine-grained way in that we are going to have Nix expressions for every single plugin and its dependencies. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * gajim: Provide more complete fix for GnuPG 2.1.13aszlig2016-07-041-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | The previous attempts only fixed the KEY_CONSIDERED status line for a few specific GnuPG functions, but after looking up the GnuPG source code the status line can happen on virtually *any* function that looks up one or more keys. So this time, we're going to add handling of KEY_CONSIDERED to every single status line handler. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * gajim: Fix patch for fixing with GnuPG 2.1.13aszlig2016-07-041-10/+9
| | | | | | | | | | | | | | | | | | | | | | The previous patch didn't handle the KEY_CONSIDERED status at the correct position, because the status will be returned during signing and not during verification. So this time, let's handle it during signing and actually test it (I did and it worked). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * taalo-build: Set pipefail for nix-instantiateaszlig2016-07-041-0/+1
| | | | | | | | | | | | | | | | If the nix-instantiate step in taalo-build should fail, we want it to fail altogether rather than just going on and bailing out very late (with an exit status of 0) when the readlink call fails. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * gajim: Fix against GnuPG 2.1.13aszlig2016-07-042-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | GnuPG 2.1.13 has introduced a KEY_CONSIDERED status, which isn't really picked up well by Gajim: https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000390.html There is also a new NOTATION_FLAGS status, but that shouldn't have an effect on Gajim. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | modules/openlab: factor out base configurationProfpatsch2016-07-083-54/+78
|/
* modules/gnupg: Don't close/remove sockets on stopaszlig2016-06-261-24/+78
| | | | | | | | | | | | | | | | | | | | | | When using systemctl restart or systemctl stop on any of the GnuPG services, the sockets were closed and removed. However we are using socket activation, so a simple restart of for example the agent would cause the socket to be closed and removed and afterwards the gpg-agent service is unable to pick up the socket again, thus failing to start. This in turn has led to GnuPG starting the agent by its own, entirely bypassing socket activation and our shiny service module. In order to cope with this, we need to provide LD_PRELOAD wrappers also for remove() and close(), so that we can prevent GnuPG from closing the systemd file descriptors. I've also added a small subtest to ensure this won't happen again in the future. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/gnupg: Support sockets in XDG_RUNTIME_DIRaszlig2016-06-261-7/+16
| | | | | | | | | | | | | | | | | | | Since GnuPG version 2.1.13 (NixOS/nixpkgs@b586b00), there is support for XDG_RUNTIME_DIR so the sockets are in /run/user/gnupg instead of ~/.gnupg. The full announcement can be found here: https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000390.html Unfortunately the fix is a bit more complicated, because if GNUPGHOME is set to a non-default location, the sockets are to be found within the directory specified in $GNUPGHOME instead. So we also need to check the version of GnuPG so that we can properly split up the socket directory from the GNUPGHOME. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Switch to pulseaudioFull for most of my machinesaszlig2016-06-261-0/+1
| | | | | | | | The default (light) package doesn't contain all the modules I need from time to time, so having te replace the running pulseaudio daemon with the full one is more of a hassle than worth keeping the light package. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/labtops: arduinoProfpatsch2016-06-181-2/+3
|
* profiles/workstation: Disable Microsoft fontsaszlig2016-06-071-1/+0
| | | | | | | | | | After disabling allowUnfree a while ago, I also decided that I want my machines to stay clear of proprietary stuff as much as possible. And as I particularly don't use any of the Microsoft corefonts, I don't shed a tear if they're gone :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* workstation/packages: Add "santander" browseraszlig2016-06-061-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Fix signingkey Git optionaszlig2016-06-051-1/+1
| | | | | | | | | The right name for it is "signingkey" instead of "signkey" and the reason this has worked for so long was that if there is no signingkey value set, Git falls back to using the users name and email address instead, which is accepted by GnuPG as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* taalo-build: Fix picking up derivation pathsaszlig2016-06-051-2/+2
| | | | | | | | | | | | | Regression introduced by fba5c2469bd5e95857c4ffd9db3dd0529f2485f3. The derivation paths returned by nix-instantiate are usually valid store paths, except when used with --add-root. In case of the latter, we get the root symlink back, so we need to do an additional readlink on it. We also now pass -t to mktemp so that $TMPDIR or /tmp is used instead of the current working directory. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Update my GnuPG public keyaszlig2016-06-052-2/+2
| | | | | | | | | | | Time for a new GnuPG key, this time CCID-only :-) This is the last commit you'll get using my old key (which will soon be revoked as soon as I moved everything over to use the new key), so if you're paranoid be sure to check the fingerprint against the signature of this very commit. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Add link to derivation fileaszlig2016-06-041-2/+10
| | | | | | | This is needed to ensure that the .drv file doesn't get garbage collected while we're transferring it to taalo. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Handle multiple outputsaszlig2016-06-041-1/+1
| | | | | | | We need to split off the !output from the derivation name returned by nix-instantiate, because we can't realize such a path. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Enable GnuPG scdaemonaszlig2016-06-041-0/+1
| | | | | | This is needed to access things such as the YubiKey 4. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/packages: Add the whole aqbanking stackaszlig2016-06-041-0/+3
| | | | | | | | | | I'm doing online banking using FinTS/HBCI via a card reader, so libchipcard is needed as well. Another package I've added is gwenhywfar because it contains commands such as gct-tool, which is useful for debugging. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Enable PCSC-Liteaszlig2016-06-041-0/+3
| | | | | | | Needed for various stuff such as YubiKey and card readers I use for online banking. Signed-off-by: aszlig <aszlig@redmoonstudios.org>