about summary refs log tree commit diff
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* core/tests: Fix eval of wireguard tests for realaszlig2020-06-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | I even mentioned the full names of the test attributes in bc4203d221c87a0622d089aaa61884f86d40fd44: tests.wireguard.wireguard-basic-linux-5_4 tests.wireguard.wireguard-basic-linux-latest tests.wireguard.wireguard-generated-linux-5_4 tests.wireguard.wireguard-generated-linux-latest tests.wireguard.wireguard-namespaces-linux-5_4 tests.wireguard.wireguard-namespaces-linux-latest tests.wireguard.wireguard-wg-quick-linux-5_4 tests.wireguard.wireguard-wg-quick-linux-latest So I forgot about the additional "wireguard-" prefix, so Hydra fails to evaluate again: in job 'tests.nixos.wireguard.basic-linux-5_4': evaluation aborted with the following error message: 'cannot find attribute `nixos.wireguard.basic-linux-5_4'' Signed-off-by: aszlig <aszlig@nix.build>
* core/tests: Add missing wireguard attr suffixesaszlig2020-06-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | Commit 89c3cda819da5dc32e4a29ff8f2aad118bde64c7 changed the wireguard attributes to use nested attributes because it was changed upstream. However what the commit has missed is that the attributes are not just plain attributes but come with a kernel version suffix, for example like this: tests.wireguard.wireguard-basic-linux-5_4 tests.wireguard.wireguard-basic-linux-latest tests.wireguard.wireguard-generated-linux-5_4 tests.wireguard.wireguard-generated-linux-latest tests.wireguard.wireguard-namespaces-linux-5_4 tests.wireguard.wireguard-namespaces-linux-latest tests.wireguard.wireguard-wg-quick-linux-5_4 tests.wireguard.wireguard-wg-quick-linux-latest Adding the "-linux-${version}" suffix should fix evaluation. Signed-off-by: aszlig <aszlig@nix.build>
* core/tests: Fix attribute paths for wireguardaszlig2020-06-031-3/+6
| | | | | | | | | | | | | | | | | | A few days ago, the wireguard tests were consolidated[1] into a single attribute with various subattributes, similar to how the virtualbox tests and many other tests are structured. I fixed the attributes and also added the wg-quick attribute that was also introduced in the meantime[2]. This should fix the evaluation errors occuring whenever a channel contains a machine configuration with wireguard enabled. [1]: https://github.com/NixOS/nixpkgs/commit/41bd6d2614749d12ce5ded3e991555b56ea6b2dc [2]: https://github.com/NixOS/nixpkgs/commit/abf60791e2bd274d39e0f18def46795798f9aefd Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch
* modules/base: Fix bashdevhell2020-05-301-1/+0
| | | | I shouldn't be working today I think.
* modules/{base,packages}: Fix screendevhell2020-05-302-3/+1
| | | | Duh.
* modules/{base,packages}: Use programs.* wrapperdevhell2020-05-302-15/+22
| | | | | Replacing the simple inclusion of some programs in packages with their respective programs.* equivalent.
* modules/{packages,services}: Remove keybasedevhell2020-05-262-2/+0
| | | | Aquired by Zoom, no thanks.
* pkgs/aszlig/xournal: Switch to xournal++aszlig2020-05-211-1/+1
| | | | | | | | | | | | | The patch I added to xournal was for keeping the aspect ratio when annotating PDFs with images. However, looking at xournal++ the aspect ratio is kept by default when resizing via corners so the patch is not needed. Since I don't really care a lot whether it's xournal or xournal++ and as long as it does the very little things I intend to use it for, I don't mind if it has too many features for my taste. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/packages: Add signal-desktopdevhell2020-05-161-1/+2
| | | | Knew I forgot something in the last clean-up.
* devhell-wide: Remove unnecessary packagesdevhell2020-05-141-2/+0
| | | | Still a continuation of some housekeeping.
* zsh: Fix XTerm-specific shell initialisationaszlig2020-05-081-1/+1
| | | | | | | | | | | | | In 7faaaab0af1e30bdfb72eca02abdfe92efefe4e0, I've changed the TERM variable to contain "xterm-256color". However, in our shell initialisation, we check whether $TERM is "xterm" rather than whether $TERM *starts* with xterm. Doing the latter fixes title setting and home/end keys in Vi normal mode. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/workstation: Set XTerm colours to 256aszlig2020-05-071-0/+1
| | | | | | | | | | | So far I've been fine with just everything using 16 colours, but since I'm even using 256 colours in my own ASCII art spriting engine I think I can safely enter the 90ies and get some more colours. Of course, the XTerm version I'm using is already supporting 256 colors, it's just that the terminfo entry doesn't say so. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/workstation: Replace p7zip with unaraszlig2020-05-061-1/+1
| | | | | | | | | | | | | | A while ago, p7zip has been marked as insecure[1], and while I didn't use p7zip for any real archives, I used it for unrelated things like executables and ISO9660 images and of course occasionally also 7z files. While I haven't done extensive testing with unar, it does seem to have a similar feature set when it comes to non-archive formats and also has support for 7z archives as well. [1]: https://github.com/NixOS/nixpkgs/commit/aa80b4780d849a00d86c28d6b3c Signed-off-by: aszlig <aszlig@nix.build>
* core/tests: Fix attribute for Docker containersaszlig2020-05-051-2/+2
| | | | | | | | | | The option has been renamed[1] from just "docker-containers" to "virtualisation.oci-containers.containers", so our checks no longer evaluate. [1]: https://github.com/NixOS/nixpkgs/commit/2f7747526cc80844a506c4aa147 Signed-off-by: aszlig <aszlig@nix.build>
* profiles/packages: Remove p7zipdevhell2020-05-031-1/+0
| | | | | Unfortunately, development has seemingly ceased and has been marked as insecure in aa80b4780d849a00d86c28d6b3c78a777dd02e9a.
* modules/services/drawpile: open TCP not UDPProfpatsch2020-05-021-1/+1
|
* modules: add services/drawpileProfpatsch2020-05-022-0/+72
| | | | Headless server for the drawpile shared drawing application.
* modules/tests: Fix eval of dokuwikidevhell2020-04-241-1/+1
| | | | | | | With the merge of [1], the `.enable` check for `config.services.dokuwiki` has been removed. [1]: https://github.com/NixOS/nixpkgs/pull/83769
* treewide: Remove hardware.opengl.s3tcSupportdevhell2020-04-233-3/+0
| | | | | | | This option has been dropped upstream in 4732f59226a21b01d630c7ef4fb884bbfbe7dc83 Cc: @aszlig
* modules/services: Fix lightdm mini greeter borderdevhell2020-04-181-1/+3
| | | | | | | Since the latest update to `0.4.0` `lightdm` has added some more fine-grained options to how the greeter behaves. In this case it added a border around the password input box which doesn't look nice, so I'm making it vanish here.
* core/tests: Rename references to "nesting"aszlig2020-04-151-5/+4
| | | | | | | | | | | The nesting.clone and nesting.children options were renamed[1] upstream and they're now contained in one single submodule option, which means that for our tests we only need to check for config.specialisation instead of nesting.clone and nesting.children separately. [1]: https://github.com/NixOS/nixpkgs/commit/ec2d28e3233c4c04fe6afe13e82 Signed-off-by: aszlig <aszlig@nix.build>
* core/tests: Remove check on graphite.pageraszlig2020-03-231-1/+1
| | | | | | | | | | | | All of the NixOS options in services.graphite.pager have been removed in 37ffa6ea51f3a3d7e43736b9a5ce3c149dd9d1ee, but since we're using the "enable" option to check whether we need to run tests, we'll get an eval error. Removing the check fixes the evaluation error. Signed-off-by: aszlig <aszlig@nix.build> Reported-by: @devhell
* profiles/base: Switch back to latest kerneldevhell2020-03-041-1/+1
| | | | | With VirtualBox gone, I should be able to use the latest Linux kernel again. Yippie!
* profiles/services: Disable virtualboxdevhell2020-02-291-1/+1
| | | | | | | | | I've been trying to get away from VirtualBox for quite some time now. unfortunately work has been preventing me from ditching it. I've been doing some tests with virt-manager and, for now, I think it might be an okay replacement. The only problem is that I've not found a way to similarly export/import VMs in a convenient fashion which VirtualBox offers.
* profiles/base: Remove nerdfontsdevhell2020-02-261-1/+0
| | | | | Having added nerdfonts was a bad idea because it's 5G apparently. Let's not do this to aszlig's hydra.
* profiles/base: Add nerdfonts and cozettedevhell2020-02-251-0/+2
|
* devhell: Replace chromium with bravedevhell2020-02-221-1/+1
| | | | | | | | | I'm quite tired and bored of things like [1]. I can't find evidence that Brave has implemented this, so Brave will replace Chromium. [1]: https://www.chromestatus.com/feature/4733392803332096
* machines/{eir,gunnr}: Switch pamixer to profiledevhell2020-02-111-0/+1
| | | | Small but still valid step towards more de-DRYing.
* profiles/base: Temporarily pin Kernel versiondevhell2020-02-101-1/+1
| | | | | VBox doesn't build with the newest Kernel. So, best to stick with the old 5.4 for now.
* core/tests: Fix option check for buildkite-agentsaszlig2020-02-101-1/+1
| | | | | | | | | Another thing I missed in ffa7a45ba0aa27c926472e23587423bc07a6db53 is that not only the module got renamed, but its interface has changed as well and instead of an "enable" option, it's now just an attribute set of submodules and the service(s) are enabled whenever it's non-empty. Signed-off-by: aszlig <aszlig@nix.build>
* core/tests: Rename module for buildkite-agentaszlig2020-02-101-2/+2
| | | | | | | | | | | | The buildkite-agent module, NixOS test and option got renamed[1] to its plural form, also supporting multiple agents. While none of our machines are using the module, we nevertheless need to fix the module option attribute so that our channels will evaluate. [1]: https://github.com/NixOS/nixpkgs/commit/f003810989c58746db9ea52f623 Signed-off-by: aszlig <aszlig@nix.build>
* core/tests: Remove docker-preloader testaszlig2020-02-101-4/+0
| | | | | | | | This test is only really useful in test environments and is imported only within the QEMU test driver. The NixOS module option is not available otherwise, which in turn will cause the evaluation to fail. Signed-off-by: aszlig <aszlig@nix.build>
* programs/mpv: Fix eval error for real this timeaszlig2020-02-101-5/+3
| | | | | | | | | | | When fixing the eval error in 67e921d264c7832ac97e39ef73df760a20ad2b47, I forgot about the fact that overrideAttrs doesn't reside in lib but instead is a package attribute. Since using "with lib;" is making it harder to quickly catch eval errors, I also removed it from the module. Signed-off-by: aszlig <aszlig@nix.build>
* treewide: Switch to displayManager.defaultSessionaszlig2020-02-104-15/+6
| | | | | | | | | | | | | | The option services.xserver.desktopManager.default and services.xserver.windowManager.default are deprecated since quite a while[1], so let's use the displayManager.defaultSession option instead. Additionally, there no longer is any need to explicitly disable the "xterm" desktopManager, so I removed that option as well. [1]: https://github.com/NixOS/nixpkgs/commit/8dc5ff7dcfd1c58c32004ffae25 Signed-off-by: aszlig <aszlig@nix.build> Cc: @devhell
* programs/mpv: Fix evaluation for installPhaseaszlig2020-02-101-2/+2
| | | | | | | | | | | | | | The package no longer[1] uses an installPhase but instead the same is now in postInstall. Since that module is pretty old I didn't use a fallback to an empty installPhase, so the evaluation fails now. Using postInstall along with a proper fallback should fix this, although I haven't tested whether $out/etc/mpv/mpv.conf is still recognised by mpv nowadays, we'll see... [1]: https://github.com/NixOS/nixpkgs/commit/542d7589568c2f3c6ac58c6e307 Signed-off-by: aszlig <aszlig@nix.build>
* core/tests: Fix evaluation for docker-preloaderaszlig2020-02-101-1/+2
| | | | | | | | | Eval error introduced by 0f0e3cef6297d1334a3b1c27bb125490850be84f. The virtualisation.dockerPreloader attribute doesn't include an "enable" option, but instead is configured by specifying a list of images. Signed-off-by: aszlig <aszlig@nix.build>
* programs/zsh: Set key timeout to 0.01 secondsaszlig2020-02-101-0/+1
| | | | | | | | | | | | | Since I'm using Vi keybindings, pressing the Escape key is something I do rather frequently. Having to wait for roughly a second after that gets pretty annoying after a while, so let's set the timeout to 0.01 seconds. This should usually be "small enough" to not interfere with other key sequences resulting in escape characters, but let's see how this will play out after a while. Signed-off-by: aszlig <aszlig@nix.build>
* programs/mpv: Don't youtube-dl videos > 1080paszlig2020-02-101-0/+1
| | | | | | | | Since more and more "Ultra HD" videos are out there, it really doesn't make any sense to play such big resolutions if the monitor only is a 1080p display. Signed-off-by: aszlig <aszlig@nix.build>
* Fix deprecated displayManager.auto.enable optionaszlig2020-02-101-2/+3
| | | | | | | | | | | | | | | | Since a while[1], the services.xserver.displayManager.auto option is deprecated. Since first of all SLiM got removed and now every display manager supports auto-login, I switched the labtops module to use the LightDM implementation. Since the common x11 test module still exposes a similar interface, we only need to use the same options from the test-support option, which should hopefully be a "sane default" suitable for tests. [1]: https://github.com/NixOS/nixpkgs/commit/c95612a5a2d4bd93011c042066c Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch
* core/tests: Update upstream NixOS testsaszlig2020-02-101-63/+606
| | | | | | | | | | | | | | | | | It has been a while, since we did a full update of all the tests, which we last did in 3ea85a699a65dbdd4f633d21e70be6859b0f3f8f (April 2018). Since then, a whole lot of tests were added and a few of them got removed as well. Since we only did incremential updates whenever something broke, we didn't have any newer tests. We should now have conditions of all the tests we have in nixpkgs master[1] minus a few special ones, which are only related to upstream image generation (eg. the ec2 test). [1]: https://github.com/NixOS/nixpkgs/commit/637bb9fa984238f2f7e6235ca11 Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Add TT2020 fontdevhell2020-02-031-0/+1
|
* profiles/packages: Add termsharkdevhell2020-01-281-0/+1
|
* profiles/packages: Add httpiedevhell2020-01-161-0/+1
|
* profiles/packages: Add brootdevhell2020-01-131-0/+1
|
* profiles/{base,packages}: Add fira-code & taskelldevhell2020-01-112-0/+2
|
* devhell: rm/add general and specific packagesdevhell2020-01-031-5/+2
| | | | | | Trying to get around to cleaning out packages I don't need on a normal basis, this is the start of a number of future commits that will be dealing with cleaning up and optimising my package usage.
* profiles/packages: Add glowdevhell2020-01-021-0/+1
|
* machines: `consoleFont` and `consoleKeyMap` moved to `console`Profpatsch2019-12-222-4/+8
| | | | | | Fixes the evaluation warning. cc @aszlig @devhell @sternenseemann
* profiles/workstation: Remove xpdfaszlig2019-12-081-1/+0
| | | | | | | | | | | | | | | | | | | Package currently doesn't evaluate because: > Package xpdf-4.02 in ... is marked as insecure, refusing to evaluate. > > Known issues: > - CVE-2018-7453: loop in PDF objects > - CVE-2018-16369: loop in PDF objects > - CVE-2019-9587: loop in PDF objects > - CVE-2019-9588: loop in PDF objects > - CVE-2019-16088: loop in PDF objects While this might be fixed in the future, I'm removing the package anyway, because I'm using zathura for quite a while (since mid 2016 to be exact) and never used xpdf a single time since then. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Fix up renamed gvfs optionaszlig2019-12-081-1/+1
| | | | | | | | | | The option has been moved[1] out of services.gnome3 since quite a while, so let's actually use the new option "services.gvfs.enable" instead. [1]: https://github.com/NixOS/nixpkgs/commit/67ad8a788fe0a8c22910d68d470416b6f5626740 Signed-off-by: aszlig <aszlig@nix.build> Reported-by: @dwenola