about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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-103-5/+5
| | | | | | | | | | | | | | | | 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>
* pkgs/psi: Temporarily disable Jingle sessionsaszlig2020-02-102-0/+13
| | | | | | | | | | | | | | | When getting an incoming file transfer, Psi has crashed a while ago and I unfortunately don't remember the exact details. However, since those stanzas are going to be re-delivered every time we start Psi again, I'd like to debug this in an isolated environment rather than being more or less forced to stay unavailable (especially annoying if someone is trying to send a file and then you stay offline for hours). So until I get to debugging this and ideally also test this in an automated fashion, I'll disable it for now since I'm not using Jingle sessions at the moment. Signed-off-by: aszlig <aszlig@nix.build>
* pkgs/psi: Update to latest upstream masteraszlig2020-02-104-50/+50
| | | | | | | | | | | Updating to latest master fixes one of the most annoying theming issue where the chat message input box text will turn black on dark background for my custom Qt theme. There are also quite a lot of fixes in master (which is still unreleased), which we want to have as well. Signed-off-by: aszlig <aszlig@nix.build>
* invisigun-heroes: Update to version 1.7.16aszlig2020-02-101-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of changes have been introduced in version 1.7.6, so here is a small summary: * New "The Hero's Journey" mode, which allows to discover the abilities of each hero along with challenges and puzzles. * Three new heroes: Djaan-Khe, Zephyr, Violet * Challenge mode has been removed (replaced by "The Hero's Journey"). * Guest Edition has been removed. The full changelog can be found here: http://www.sombr.com/pub/SIG/changelog/ While Invisigun Heroes in general went pretty smooth when it comes to packaging on our side, this time unfortunately we needed to patch something. There is now a new "config.json", which is written inside the game's data directory. Of course, since the data directory resides in the Nix store, I've relocated the file to be written into the the config directory ($XDG_CONFIG_HOME/unity3d/Sombr Studio/Invisigun Reloaded) of the game. Note that the config directory has also changed from "Invisigun Heroes" to "Invisigun Reloaded", so if you don't want to play the old version, you can delete the "Invisigun Heroes" directory. Signed-off-by: aszlig <aszlig@nix.build>
* monogame-patcher: Also patch late-bound methodsaszlig2020-02-101-1/+2
| | | | | | | | | | | | | | This is something I encountered in Invisigun Heroes, where there is a virtual FileManagerAdapter class, which then gets bound to either the Desktop variant or any of the other ones. Since we always use the full path of the corresponding type/object, just adding the Callvirt to the opcodes we patch shouldn't interfere with any other games we patch that way and using an extra subcommand just for the Callvirt case would only add additional boilerplate for no additional benefits. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Add TT2020 fontdevhell2020-02-031-0/+1
|
* profiles/packages: Add termsharkdevhell2020-01-281-0/+1
|
* pkgs/profpatsch/execline/e: better promptProfpatsch2020-01-261-12/+14
| | | | | | rlwrap has to do magic recognition, which breaks in most cases. We can just print a prompt before the first and after each consecutive command. Seems to work wonderfully.
* pkgs/profpatsch/execline/e: add prompt colorProfpatsch2020-01-261-0/+2
|
* pkgs/profpatsch/execline/e: fix buffering problemProfpatsch2020-01-261-3/+0
| | | | Forgot the cat after I added forstdin.
* pkgs/profpatsch/execline/e: fix line splittingProfpatsch2020-01-261-6/+6
|
* pkgs/profpatsch/execline: add eProfpatsch2020-01-262-0/+25
|
* pkgs/profpatsch/execline: add runblockProfpatsch2020-01-262-0/+71
|
* pkgs/profpatsch/write-execline: add all argparsing commandsProfpatsch2020-01-261-2/+20
| | | | | | In some cases (especially with `runblock`), the arguments need to be accessible as environment variables, so we need a way to pass that to execline.
* machines/profpatsch/shiki: use dhall from binary releaseProfpatsch2020-01-263-22/+2
| | | | | | | | | The hackage (and thus nixpkgs) version is sadly very much outdated. Luckily, Justin Woo provides the statically linked binaries from the upstream project. This won’t work for patches or using the library, but at the moment it’s okay.
* pkgs/profpatsch/warpspeed: 1.0 -> 1.1Profpatsch2020-01-262-6/+33
| | | | | | - Add argument for which host to bind against. - Add argument to specify where the root address should be redirected to (if at all)
* escape: support pathsYorick2020-01-181-0/+1
| | | This makes ./foo work.
* machines/dnyarri: Provide luks.devices as attrsetaszlig2020-01-181-2/+3
| | | | | | | | | | | | | | | | The use of types.loaOf has been deprecated since quite a while and lately[1] there is also an appropriate warning in place if an option definition relies on types.loaOf to coerce the list to an attrset. In vuizvui we didn't rely on types.loaOf, but it turned out that dnyarri still relied on it in boot.initrd.luks.devices. Since we already use attrsets for defining the LUKS devices, it's rather easy to fix and we just need to return a nameValuePair in mkDevice. [1]: https://github.com/NixOS/nixpkgs/commit/03309899eb41e50ef65001f63d6a4f078e3d4556 Signed-off-by: aszlig <aszlig@nix.build>
* 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-032-7/+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/hildr: Switch hildr to Lat2-Terminus16devhell2020-01-021-1/+1
| | | | Can't believe I missed that.
* machines/hildr: Switch from wpa_supplicant to iwddevhell2020-01-021-2/+2
| | | | | | Now that I've finally found a few minutes to mess with iwd's configuration successfully I can switch completely. Only annoyance is iwd's insistence on switching the interface name to 'wlan0'.
* pkgs/profpatsch/youtube2audiopodcast: fix a few thingsProfpatsch2019-12-272-5/+5
|
* pkgs/profpatsch/youtube2audiopodcast: use v4 localhost for tcpserverProfpatsch2019-12-271-1/+1
|
* pkgs/profpatsch/youtube2audiopodcast: use ::1 for tcpserverProfpatsch2019-12-271-1/+1
|
* machines/profpatsch/haku: add rss2audiopodcast to nginxProfpatsch2019-12-271-1/+26
|
* pkgs/profpatsch/youtube2audiopodcast: serve rss feed & audio filesProfpatsch2019-12-272-29/+37
|
* machines/profpatsch/shiki: fix display-infos wrapperProfpatsch2019-12-221-2/+3
|
* machines: `consoleFont` and `consoleKeyMap` moved to `console`Profpatsch2019-12-229-20/+42
| | | | | | Fixes the evaluation warning. cc @aszlig @devhell @sternenseemann
* machines/profpatsch/shiki: remove/comment out unnecessary packagesProfpatsch2019-12-221-9/+8
|
* machines: remove sternenseemann.schnurrkadsesternenseemann2019-12-171-3/+0
| | | | Resolves #31
* machines/gunnr: Add teamsdevhell2019-12-161-0/+1
| | | | | | | Guess what? That's right! This machine lives in an environment where Teams is all the rage! I hate wasting browser tabs for something like Teams, so fortunately Microsoft has released Teams for Linux. We'll be using that now instead.
* pkgs/profpatsch/query-audio-streams: initProfpatsch2019-12-143-0/+94
|
* pkgs/profpatsch: move `writeHaskellInterpret` upwardsProfpatsch2019-12-142-12/+13
|
* pkgs/profpatsch/youtube2audiopodcast: youtube playlist to rssProfpatsch2019-12-092-4/+201
| | | | | Initial code that fetches a youtube playlist (from ID) and converts it to an rss feed.
* pkgs/profpatsch/youtube2audiopodcast: clean imports and use s6 catProfpatsch2019-12-091-2/+5
|
* pkgs/profpatsch/youtube2audiopodcast: factor out http servingProfpatsch2019-12-091-14/+22
|
* 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
* modules/bfq: Rebase patch against kernel 5.4aszlig2019-12-082-1/+15
| | | | | | | | | | | The patch no longer applies because the default elevator initalisation has been refactored a bit[1] in kernel 5.4. Content-wise our patch is still the same. [1]: https://github.com/torvalds/linux/commit/a0958ba7fcdc316e3900f8d2afda519850d60985 Signed-off-by: aszlig <aszlig@nix.build>
* treewide: Remove all references to SLiMaszlig2019-12-084-50/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following evaluation error: The option `services.xserver.displayManager.slim' can no longer be used since it's been removed. The SLIM project is abandoned and their last release was in 2013. Because of this it poses a security risk to your system. Other issues include it not fully supporting systemd and logind sessions. Please use a different display manager such as LightDM, SDDM, or GDM. You can also use the startx module which uses Xinitrc. Here is the nixpkgs upstream pull request removing SLiM: https://github.com/NixOS/nixpkgs/pull/73251 Since I was using a custom theme for SLiM and actually liked the minimalism, it's probably time to start patching LightDM soon. For now however, I'll stay with a default LightDM configuration and wait until I'm getting annoyed :-) Signed-off-by: aszlig <aszlig@nix.build>