about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* vim: Add syntax highlighting for Jinja2aszlig2019-06-111-0/+9
| | | | | | | Jinja2 seems to be quite popular these days for all sorts of templates, so let's actually use the syntax file from the actual Jinja2 package. Signed-off-by: aszlig <aszlig@nix.build>
* vim: Add syntax/indent configuration for PHPaszlig2019-06-111-0/+7
| | | | | | | | | | | | | | Unfortunately, I need to deal with PHP code occasionally, so let's make syntax highlighting less painful. I'm not sure why the option is called PHP_vintage_case_default_indent, but I prefer case statements to be indented. Apart from HTML/SQL syntax highlighting within PHP strings, I also want to prevent short open tags, so that whenever I stumble on code using it I can immediately fix them. Signed-off-by: aszlig <aszlig@nix.build>
* games: Use preferLocalBuild for fetchersaszlig2019-06-114-0/+7
| | | | | | | | | | | | | | | | If we're on a machine with remote builds enabled, we'd like to prefer not having our login credentials to be pushed on a remote server. We of course also don't want the actual games to end up on a different machine, so let's use preferLocalBuild to avoid this. Unfortunately avoidance is not at any cost, because if we for example use a different system attribute, it might be built on a remote machine nevertheless. Ideally there would be something like "forceLocalBuild", which avoids remote builds at any cost. Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch
* games/gog: Add Heroes of Might & Magic 3: Completeaszlig2019-06-113-0/+134
| | | | | | | | | | | | | | | I had this laying around for quite a while but haven't committed it yet, so I decided to update VCMI to the latest master version. Instead of using the "mp3" directory in the game assets, I decided to go for "music" instead, because all of the files within that directory are actually Ogg Vorbis and it's the game's music. Another thing I've changed is that the launcher now uses execl() instead of QProcess::startDetached, because the latter doesn't work very well with our sandbox and will subsequently cause the client to be killed. Signed-off-by: aszlig <aszlig@nix.build>
* crosscode: 1.0.3 -> 1.1.0aszlig2019-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | This introduces the arena in Rhombus Square, which was previously closed, as a major update. The full release announcement can be found at: https://www.radicalfishgames.com/?p=6772 Apart from the arena update here are the rest of the changes: * Finally fix "Wet Work" quest softlock * New Arena tab in Statistics Menu * Introduce pets * A new quest can be found in Sapphire Ridge * A new quest in Ba'kii Kum * New challenges available for the Turret Defense Quests * New equipment and trade offer in Rhombus Square * More guest role NPCs here and there * Remove "Save FIle" version from the save/load menu Signed-off-by: aszlig <aszlig@nix.build>
* fetch-gog: Provide a better login failure messageaszlig2019-06-111-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | So far if the login credentials were wrong, you get something like this: Traceback (most recent call last): File "/nix/store/...-fetch-gog.py", line 113, in <module> GogFetcher(sys.argv[1], sys.argv[2], sys.argv[3]).fetch() File "/nix/store/...-fetch-gog.py", line 15, in __init__ self.login() File "/nix/store/...-fetch-gog.py", line 28, in login auth_code = parse_qs(urlsplit(browser.get_url()).query)['code'] KeyError: 'code' This is isn't very helpful and might hint that there is something wrong with the fetcher. Of course, if GOG would change their login interface and no longer expose the "code" query string item, it might still say login failure, but right now we don't have a better way to detect it. At least if we get a login failure with a login that has been working so far, we know something has changed upstream :-) Signed-off-by: aszlig <aszlig@nix.build> Reported-by: @Profpatsch
* crosscode: 1.0.2 -> 1.0.3aszlig2019-06-111-2/+2
| | | | | | | | | | | | | | Upstream changes: * Add a couple of new quests, new NPC dialogs and a few small details here and there * Finish the "A Promise is a Promise" quest line * The Last Minute Heroes guild headquarters is finally open to everyone, with a new quest * New consumable item is now dropped by the Moon bugs in Sapphire Ridge Signed-off-by: aszlig <aszlig@nix.build>
* machines/shiki: move the notify-send invocation outProfpatsch2019-05-312-3/+8
|
* machines/shiki: give up, just add "docker" group to userProfpatsch2019-05-311-1/+1
|
* machines/haku: set up as VPN server with wireguardProfpatsch2019-05-311-5/+54
| | | | | | | | | | | | Generates a wireguard configuration based on https://nixos.wiki/wiki/Wireguard and sets up the iptables firewall in a way that only enables forwarding between `eth0` and the `wg` interfaces. The standard NixOS firewall configuration allows `FORWARD` between all interfaces, and `networking.nat.enable` enables the `ip_forward` rule in the kernel, meaning packages can suddenly hop interfaces without a firewall that `DROP`s forwards by default.
* pkgs/profpatsch/DhallTypedInput: Document moduleProfpatsch2019-05-181-40/+91
|
* pkgs/profpatsch: Haskell dhall import with custom typesProfpatsch2019-05-181-0/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First working mockup of a dhall Haskell API that can read files of the (normalized) form ``` \(CustomType: Type) -> \(AnotherType: Type) -> … ``` and set their actual representation on the Haskell side. This has various advantages: - dhall files still type check & normalize with the normal dhall tooling, they are standalone (and the types can be instantiated from dhall as well without any workarounds) - It can be used like the default `input` function, no injection of custom symbols in the Normalizer is reqired - Brings this style of dhall integration to Haskell, where it was only feasible in nix before, because that is untyped The dhall types can be instantiated by every Haskell type that has an `Interpret` instance. The “name” of the type lambda variable is compared on the Haskell side with a type-level string that the user provides, to prevent mixups. TODO: - Improve error messages (!) - Provide a way to re-use the type mapping on the Haskell side, so that the returned values are not just the normal `Interpret` types, but the mapped ones (with name phantom type)
* machines/haku: open less ports in firewallProfpatsch2019-05-162-3/+3
|
* machines/profpatsch: move more stuff into base-workstationProfpatsch2019-05-162-4/+7
|
* machines/profpatsch: move stuff into base-workstationProfpatsch2019-05-162-73/+85
|
* pkgs/profpatsch: manual dhall-nix updateProfpatsch2019-05-161-1/+12
|
* profiles/base: Disable vistafontsdevhell2019-05-141-1/+1
| | | | Currently marked as broken in nixpkgs.
* machines/{eris,titan}: Remove cruft in xrdbdevhell2019-05-032-8/+0
| | | | | | | | I've had these packages in here disabled in case I'd ever have to get back to them. I've not had to for, what feels like, an eternity. Additionally to slimming the config down, removing them will also somewhat slim down closure size since Nix will build them anyway even though they're not actively used.
* profiles/base: Add `dev` to `audio` groupdevhell2019-04-291-1/+1
| | | | | Pulse used to work fine without this, something changed, and so I'm adding `dev` to `audio` as that seems to fix it.
* profiles/base: Add user dev to video groupdevhell2019-04-291-1/+1
| | | | Without this `programs.light.enable` has no effect.
* pkgs/profpatsch/display-infos: display remaining battery lifeProfpatsch2019-04-231-5/+37
| | | | The battery life is displayed as an [sft] timespan.
* pkgs/profpatsch/sfttime: factor out the sft epochProfpatsch2019-04-231-2/+4
|
* pkgs/profpatsch: fix hnix overrideProfpatsch2019-04-201-0/+1
|
* pkgs/profpatsch/nman: fix go buildProfpatsch2019-04-201-1/+3
|
* pkgs/profpatsch/display-infos: add sfttime and AC chargerProfpatsch2019-04-202-7/+10
|
* pkgs/profpatsc: add sfttimeProfpatsch2019-04-203-0/+158
|
* machines/{eris,titan}: Fix 'light' inclusiondevhell2019-04-192-3/+4
| | | | | | The previous commit was wrong in that it was not the correct way to include the 'light' package. According to the manual, this is the correct way.
* machines/{eris,titan}: Add 'light' packagedevhell2019-04-192-2/+3
| | | | | | Since the 'modesetting' driver does not work with 'xbacklight' we have the choice of either 'light' or 'backlightctl'. For now we'll choose 'light' and see how it goes.
* machines/{eris,titan}: Switch to modesettingdevhell2019-04-192-2/+2
| | | | | The release notes for NixOS 19.03 state that the 'intel' driver has been superseded by the 'modesetting' driver.
* build-support/build-sandbox: add support for mounting /nixProfpatsch2019-04-183-19/+53
| | | | | | Enables us to run nix *inside* of a sandbox. We have to mount the whole store, because otherwise realized store paths built inside of the sandbox are not accessible.
* buildSandbox: return the exit status of wrapped executableProfpatsch2019-04-181-2/+18
| | | | | Since we want to create a transparent sandbox, returning the same exit code as the wrapped process is very important.
* profiles/services: Theme lightdm-greeter-minidevhell2019-04-071-0/+12
| | | | | This fits a bit better to the overall NixOS default background than the default hot pink window color and style.
* profiles/services: Switch to lightdm-greeters.minidevhell2019-04-071-1/+7
| | | | Much more visually pleaseing thane the default gtk greeter.
* profiles/packages: Add i3lock-fancydevhell2019-04-031-0/+1
| | | | Can't decide yet which one I'll prefer.
* machines/titan: Enable glx and vsync for comptondevhell2019-04-031-0/+2
|
* pkgs/profpatsch: add dhall types for s6 servicedirProfpatsch2019-04-0223-0/+285
| | | | | First version of a way to build s6 services using `dhall-to-nix`. Includes a small library that formalizes the tables in `man 7 signal`.
* profiles/base: Switch back to linuxPackages_latestdevhell2019-03-291-1/+1
| | | | VBox and BFQ issues solved.
* pkgs.profpatsch: add git-commit-index toolsProfpatsch2019-03-253-0/+178
| | | | | | | A set of utilities to generate and query a git commit index, which is a database that knows which revs (that is: commits) are in which git repository. That way we can query for the project that contains a commit and show them, e.g. with xdg-open.
* pkgs.profpatsch: add nixperimentsProfpatsch2019-03-251-0/+22
|
* machines/profpatsch: katara -> shiki (hostname)Profpatsch2019-03-251-3/+3
|
* machines/profpatsch: katara -> shiki (file rename)Profpatsch2019-03-252-1/+1
|
* modules/profpatsch/scanning: add hplipProfpatsch2019-03-251-1/+2
|
* machines/katara: miscProfpatsch2019-03-252-12/+15
|
* machines/katara: nix optionsProfpatsch2019-03-251-0/+4
|
* sandbox: Add an option to set up /bin/shaszlig2019-03-234-5/+45
| | | | | | | | | | | | | | | | So far I mostly used this implementation for the games we have packaged, where we pretty much patch out all commands that execute external programs. However in order to be useful in a more generic way, it makes sense to provide a /bin/sh implementation, especially when you have to deal with scripting languages. I'm using dash here, because it's a more minimal implementation rather than the default shell (bash) we use in nixpkgs and it practically only needs to be able to run constructs like "/bin/sh -c foo". Signed-off-by: aszlig <aszlig@nix.build>
* machines: Remove kzerzaaszlig2019-03-202-70/+0
| | | | | | | | This machine was used for controlling the LED lighting bars at Rockfabrik. I no longer work there and the machine has subsequently been replaced by something else, so I don't need kzerza anymore. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/workstation: Remove lastwatchaszlig2019-03-191-1/+0
| | | | | | | I no longer use last.fm nor do I use this project (even though it's my own one), so let's remove it. Signed-off-by: aszlig <aszlig@nix.build>
* bfq: Fix kernel config with SCSI_MQ_DEFAULTaszlig2019-03-191-1/+1
| | | | | | | This option was removed in Linux 5.0, so let's make its absence non-fatal for the build of the config. Signed-off-by: aszlig <aszlig@nix.build>
* modules/vlock: Allow to change the user nameaszlig2019-03-112-1/+12
| | | | | | | | | | | | When writing that module back then in 88a10f1a6e2ea172ff985f64bfcf82e2, I had to work around a systemd limitation (which I need to check whether this is still the case today) and hardcoded the user name for the time being. While it's still quite ugly, there was interest from @Profpatsch, so I decided to add an internal option to change that username. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Switch to generic font-awesomedevhell2019-03-041-1/+1
| | | | | This will prevent version pinning and always install the latest and greatest.