about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* machines/tyree: Avoid renaming network interfacesaszlig2016-07-111-0/+3
| | | | | | | | | | | | | | | | | This seems to be related to this bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1434986 The problem here is a race condition, because NetworkManager is trying to pick up the device _before_ the renaming and then fails to correctly identify it. Another solution would be to reorder the service unit after the networkd service, but that would only work well if the interface is plugged in at boot time and if it's pluggen in/out afterwards we likely have the same problem again. 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>
* machines/tyree: Add user to group networkmanageraszlig2016-07-101-1/+1
| | | | | | | | | | | The main user currently doesn't have permissions to use NetworkManager, because until now I've used a fixed list of APs directly using wpa_supplicant.conf and disabled NM via configuration.nix. However for end users it's a bit tedious to manage wireless networks that way, so let's add user "bla" to the networkmanager group. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Add Okular to systemPackagesaszlig2016-07-101-2/+2
| | | | 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>
* machines/labtops: don’t build full configProfpatsch2016-07-081-3/+1
| | | | Only some machines should get the full config (with all packages).
* 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-084-54/+80
|/
* Merge remote-tracking branch 'origin/HEAD'Profpatsch2016-07-042-7/+5
|\
| * pkgs/nixops: Fix Docbook XSL namespaceaszlig2016-07-021-0/+1
| | | | | | | | | | | | | | Docbook XSL got updated in NixOS/nixpkgs@fb893a8, so we need to adjust the path to the namespace URL to reflect the current version. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * pkgs/nixops: Update to latest upstream masteraszlig2016-07-021-5/+2
| | | | | | | | | | | | | | This also fixes our hack for libxslt.bin, because it has been fixed upstream at NixOS/nixops@3e823357f3f4825cd24c3361e511a234f6726105. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * machines/tyree: Rename deprecated optionsaszlig2016-06-281-2/+2
| | | | | | | | | | | | | | | | The options nix.useChroot and boot.loader.gummiboot.enable were changed since quite a while, so let's fix it to get rid of annoying warnings during rebuild. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | machines/profpatsch: mpv with script supportProfpatsch2016-07-041-1/+1
| |
* | machines/katara: offlineimap sync user serviceProfpatsch2016-07-041-0/+15
| |
* | machines/katara: nm-applet in env againProfpatsch2016-07-041-1/+1
| | | | | | | | | | It has buggy icon & functionality if it’s not in the system environment. Also, the tools nm-connection-manager &al. are missing.
* | machines/katara: disable locate & searx againProfpatsch2016-07-041-7/+0
| |
* | machines/katara: add inkscapeProfpatsch2016-07-041-0/+1
| |
* | machines/katara: disable flash againProfpatsch2016-07-041-2/+2
| |
* | machines/profpatsch: factor out base configProfpatsch2016-07-042-75/+106
| |
* | machines/katara: searx as local metasearchProfpatsch2016-07-031-0/+2
|/
* gitit: remove filestore patchProfpatsch2016-06-282-73/+0
|
* modules/gnupg: Don't close/remove sockets on stopaszlig2016-06-262-26/+86
| | | | | | | | | | | | | | | | | | | | | | 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>
* tests/gnupg: Remove leftover for debuggingaszlig2016-06-261-1/+1
| | | | | | | | | The shell script embedded into the expect script had "set -x" enabled. While this doesn't really hurt it doesn't really aid in debugging either (expect -d works much better), so let's remove it. 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>
* machines/tyree: Fix typo in "hardvare"aszlig2016-06-261-1/+1
| | | | | | Damn it, it seems to be too early in the morning X-D Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Switch to pulseaudioFull for most of my machinesaszlig2016-06-262-0/+2
| | | | | | | | 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>
* pkgs/axbo: Update to latest development branchaszlig2016-06-211-2/+6
| | | | | | | | | | | | This one explicitly includes a MIT license, so let's actually prefer this branch instead of the master brach. I've also included commons and streamflyer to the list of bundled JARs that are needed from the upstream repository. Of course, in the long term it would be a good idea to actually package those in <nixpkgs> so it's just temporary. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/labtops: arduinoProfpatsch2016-06-181-2/+3
|
* Revert adding dummy machine "gitit-stub"aszlig2016-06-143-15/+0
| | | | | | | | | | | | | | This reverts commit 65435d827c846ab2eef966601cd0490591b8dbe9. Commit d730df7 fixed the meta.hydraPlatforms attribute, so the generic channel now should build the patched gitit version as part of its constituents and we don't need a dummy machine just for that anymore. Other than that, the package now also gets built as a separate job to allow for one-click installs. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* pkgs/gitit: Make sure hydraPlatforms are setaszlig2016-06-141-1/+2
| | | | | | | | | | | | | | | | Within mapTestOn, meta.hydraPlatforms attribute has precedence over meta.platforms. The original gitit derivation has hydraPlatforms set to an empty list and it's aliased to meta.platforms. Unfortunately that alias doesn't work with overrideCabal, because we'd need to override the attributes passed to the callPackage'd function (the mentioned alias is done during function attrset unpacking). This fixes building gitit within the generic channel as well as including it in the pkgs.* Hydra jobs. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* pkgs/openlab.gitit: GHC 8 patchProfpatsch2016-06-132-0/+73
|
* machines/gitit-stubProfpatsch2016-06-133-0/+15
| | | | | | | | | | | | | According to 302fb4f4bc0213b231b9bf5b98093c60d3917313 the package should be included in the hydra build, but it is not usable, because there is no channel that waits for the gitit build to succeed. This stub exists until someone finds out how to create such a channel (aka the channel building mechanism is documented in a way that it can be used by people not deeply familiar with both nixpkgs and hydra). cc @aszlig
* schnurrkadse: hydra show me some lovelukasepple2016-06-111-4/+5
| | | | pls crosscompile for me :heart:
* schnurrkadse: pls don't compile dis thank youlukasepple2016-06-111-4/+4
|
* schnurrkadse: add connectlukasepple2016-06-111-0/+1
|
* pkgs/beehive: fix mysterious evaluation errorProfpatsch2016-06-101-1/+1
| | | | By disabling.
* machines/katara: corefronts got non-free licenseProfpatsch2016-06-101-1/+1
|
* schnurrkadse: remove pandoc because it's broken atmlukasepple2016-06-101-1/+1
|
* 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>
* machines/katara: add autocutsel daemonProfpatsch2016-06-061-0/+2
| | | | Clipboards finally synchronize.
* machines/katara: more explicit xinitProfpatsch2016-06-061-7/+9
| | | | Specify absolute nix store paths where possible.