about summary refs log tree commit diff
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* dnyarri/mmrnmhrm: Switch to generic kernelaszlig2016-11-281-43/+20
| | | | | | | | | | | | | | | | | I've been patching these machines up since ages and I'm tired now to do both kernel configs *again* for the recent kernel versions. Of course, in the long run I still want them to have their customized kernel, but right now it's better to have a recent generic kernel rather than have a fucked up custom kernel. Also, this removes all that cruft for the Intel HDA pinning on dnyarri, because the machine now has two X-Fi sound cards. Both machines probably won't boot now, so we'll have to adjust a few things very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/gnupg: Support --supervised since 2.1.16aszlig2016-11-282-20/+52
| | | | | | | | | | | | | | | | | | | | | | | | See the release announcement at: https://lists.gnupg.org/pipermail/gnupg-announce/2016q4/000398.html Unfortunately we still need the wrapper, because we need to pick up the PID of the socket endpoint in order to gather various information we can pass to pinentry (which then for example can recognize that the actual SSH client is using X or is using a particular TTY). On the upside however, this is a step into a direction I didn't imagine to happen anytime soon, given the following statement from Werner Koch back then: https://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029104.html However I don't think the way I'm picking up the PID and doing inspection of /proc/PID is going to happen in upstream GnuPG anytime soon. But after cleaning up and doing it as a patch I might now consider upstreaming it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/git: Fix/flesh out type for Git configaszlig2016-11-091-2/+3
| | | | | | | | | | | | | | We need to properly separate attrsOf from the nested attrsOf because otherwise the either type isn't able to distinguish between both types during merging of the subtypes. Now we have sub sections which is '[section "subsection"]' in Git's config syntax and attrsOf (attrsOf ...) on our side and simple sections like '[section]' which is just a plain attrsOf. This way we have an additional type constraint in that we can't mix up subsections with sections by the same name. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/packages: Revert using Chromium stableaszlig2016-11-091-1/+1
| | | | | | | | | This reverts commit 1fb2981f660b2155331cdac1b28640ba7c6b4786. Since NixOS/nixpkgs@c67a7ee73156796187894c63386b1a78e5902ea5, the Chromium beta channel builds fine again, so let's go back to beta. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Switch to use boot.kernelPatchesaszlig2016-10-271-12/+12
| | | | | | | | | | | | | | The implementation of boot.kernelPatches uses .override and passes back the original kernelPatches attribute to the patches that are going to be added from boot.kernelPatches. However, the T100HA module already uses .override to pass these patches but without re-using the existing patches. So instead of just adding preexisting patches to the kernelPatches attribute, let's just switch to boot.kernelPatches, which should also allow overrides and introspection from different NixOS modules. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Fix evaluation erroraszlig2016-10-271-1/+1
| | | | | | | The right attribute is vuizvui.kernel.linux_4_7 and not vuizvui.linux_4_7. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Bring back Linux 4.7.10aszlig2016-10-271-1/+1
| | | | | | | | | | | | | | Removed in NixOS/nixpkgs@b3f7d626c164ae591a067f78bfcbb06fc3a588b9. We are currently stuck in 4.7 with the T100HA because of this upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=97529 So let's bring back the expression for Linux 4.7 until there is time for debugging the mentioned bug. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Rename "kpatches" directory to "kernel"aszlig2016-10-271-1/+1
| | | | | | | | | This now should reflect "all things kernel" and thus could not only contain patches but other things. If we have so many patches that it makes sense to namespace them further, we can still use kernel/patches for that purpose which is way better than "kpatches". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/i3/conky: Fix weather URLaszlig2016-10-181-1/+1
| | | | | | | The URL has changed, see brndnmtthws/conky#325 for the fix in upstream conky. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Revert "runCommand -> runCommandCC"aszlig2016-10-171-2/+0
| | | | | | | | | | | | | This reverts commit e3f8d28d6be67257d70035d122263f3a35adc438 and my attempts to mitigate this in 0a50f5fab1abf2e70fd5d7a2dd717c2f2c1b983b and 3b91f25b37ea709f5c86e38a50061199bbed5341. Vuizvui is a repository for experimental stuff, but NOT a dumpster. So please refrain from pushing waste into this repository, like markers for a failed merge. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* Fix evaluation of module listaszlig2016-10-171-1/+2
| | | | | | | | | | | Regression introduced by e3f8d28d6be67257d70035d122263f3a35adc438. Another time where a commit references files without actually adding them. So let's remove the missing module from the module list and let only those machines break which are actually using it. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* runCommand -> runCommandCCProfpatsch2016-10-151-0/+1
|
* hardware/t100ha: Fix support for SDIO WiFi cardaszlig2016-10-133-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While I had terse Internet connectivity these days, I haven't checked T100HA hardware related news/patchs very often. Meanwhile a small patch by @tagorereddy popped up on hadess/rtl8723bs#80 which works around the SDIO detection. On some devices the BIOS has an option to map the SDIO controller to PCI instead of ACPI, but the T100HA doesn't have this option. IIUC the issue here is that the controller is already being attached via PCI device ID 80862280, which prevented the platform device from being attached via ACPI. The patch circumvents that by removing PCI device ID 80862280 while probing for ACPI devices in SDHCI (yes, very hacky but works) and forces the ACPI platform device to be initialized if the HID is 80860F14:02. I've rebased and tidied up the original patch a bit to prevent warnings during build. Other than this patch, we now need to add the right firmware and the corresponding parameters to hardware.firmware, so that the actual driver for the WiFi card can be loaded. The firmware parameters are stored in EFI on the host itself: /sys/firmware/efi/efivars/nvram-74b00bd9-805a-4d61-b51f-43268123d113 So I added a copy of it to prevent impurities. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/packages: Temporarily use Chromium stableaszlig2016-10-131-1/+1
| | | | | | | | | | Chromium's beta channel doesn't build for quite a while because the GYP stuff is heavily broken in beta and dev and we need to move to GN instead. So until that's done I'm going with the stable channel for now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* kernel: Switch to use boot.kernelPatchesaszlig2016-10-132-10/+4
| | | | | | | | Since NixOS/nixpkgs@da36847d925058fd86f027b64cc712c57be11ad8 we no longer need so much cruft to specify kernel patches, so let's switch to boot.kernelPatches instead of the hackery we had so far. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/gnupg: Use runCommandCC for wrappersaszlig2016-10-091-2/+2
| | | | | | | | | | Since NixOS/nixpkgs@97bfc2fac92d90c668ae1ec078356d0bd0a9ddb7, runCommand uses stdenvNoCC, so we don't have a compiler available anymore. However, there is now a runCommandCC function which does exactly what we want. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* gajim: Revert "Fix against GnuPG 2.1.13"aszlig2016-10-092-62/+1
| | | | | | | | | This reverts commit f0003b92674a1f4555dd14ffa271622a3889cd84. Gajim 0.16.6 has been released last week and it includes a fix for GnuPG 2, so we no longer need this patch. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/t100ha: Pin kernel to Linux 4.7aszlig2016-09-161-21/+1
| | | | | | | | | Kernel 4.8 currently has an Intel GFX regression right now, so let's keep it at kernel 4.7 until we have properly bisected the issue and/or have a fix for this. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Upstream issue: https://bugs.freedesktop.org/show_bug.cgi?id=97529
* profiles/workstation: Remove RXVT-specific optionsaszlig2016-09-121-11/+0
| | | | | | | I didn't use RXVT for years now, so it doesn't make sense to set options for it here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/gnupg: Fix path to libsystemd.soaszlig2016-09-111-1/+1
| | | | | | | The systemd library has been splitted off into a different output in NixOS/nixpkgs@78178d5854901e1b17a14bce3fe43515984b7b91. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* core/tests: Add and remove upstream NixOS testsaszlig2016-09-111-6/+10
| | | | | | | | | | | | | | | | | New tests as of NixOS/nixpkgs@4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82: * nixos.kde5 * nixos.ferm * nixos.quagga The following tests were removed: * nixos.dockerRegistry * nixos.sddm The test for SDDM is now included within the KDE5 test. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/rtl8192cu: Update to latest Git masteraszlig2016-09-072-19/+2
| | | | | | | The upstream repository now has support for kernel 4.x, so we no longer need the patch. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* hardware/rtl8192cu: Disable some hardening flagsaszlig2016-09-071-0/+2
| | | | | | | | These flags are applied via the kernel config, so if we add it using our compiler wrapper the kernel build process is unable to detect these flags and the build will fail. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* workstation/packages: Fix reference to xhostaszlig2016-09-071-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* workstation/packages: Add rsync and xhostaszlig2016-09-071-0/+2
| | | | | | | I'm regularily using rsync and xhost sometimes, but the latter is a very small package, so I don't mind having it in systemPackages. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* workstation/packages: Remove man-pages.docdevaszlig2016-09-071-1/+0
| | | | | | | The "docdev" output has been removed in upstream nixpkgs at commit NixOS/nixpkgs@e84a3524b5eaa03521bfbd5c67caec883ef76011. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/stackenblocken: change timer on WednesdayProfpatsch2016-08-311-2/+2
|
* workstation/packages: Add packages from user envaszlig2016-08-301-0/+5
| | | | | | | I'v been regularily adding those packages to my user environment, so let's add them to systemPackages so they are available all the time. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/openlab/base: add agProfpatsch2016-08-271-1/+1
|
* modules/labtops: xset typing speedProfpatsch2016-08-271-2/+7
|
* modules/labtops/base: add timezoneProfpatsch2016-08-271-0/+1
|
* modules/stackenblocken: make user service workProfpatsch2016-08-271-2/+1
|
* modules/openlab/stackenblocken: everydayProfpatsch2016-08-272-0/+31
|
* modules/labtops: pulseaudio (and streaming)Profpatsch2016-08-251-0/+5
|
* forgot a mkDefaultProfpatsch2016-08-251-1/+1
|
* modules/labtops: add packages from user envProfpatsch2016-08-251-2/+8
| | | | People needed it, so now it goes into the config.
* modules/labtops: add mpv & vlcProfpatsch2016-08-251-1/+5
|
* modules/labtops: disable man pages in base configProfpatsch2016-08-252-2/+6
|
* 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>