about summary refs log tree commit diff
path: root/modules/user/aszlig/programs
Commit message (Collapse)AuthorAgeFilesLines
* modules/git: Switch to RFC-0042aszlig2021-07-091-27/+39
| | | | | | | | | | | | | | | | | In RFC-0042[1], the structural settings are exposed via a "settings" attribute, while in our module it's called "config". To make this less ambiguous (since there is already a "config" attribute passed to modules) and more in line with best practices, I renamed it accordingly. Additionally, the configuration file is now generated via *defining* another (read-only) option, which can be used by other modules to reference the path. The previous way this has been done was using the apply attribute to mkOption, which makes it really hard to access the original attributes for these settings. [1]: https://git.io/JcXmU Signed-off-by: aszlig <aszlig@nix.build>
* modules/git: Get rid of "with lib;" and refactoraszlig2021-07-091-24/+24
| | | | | | | | | | | This gets rid of bringing all of the lib attribute into the scope of the whole module and also refactors a bit of ugliness, for example we're now using overrideAttrs instead of overrideDerivation. In addition I've simplified the type for the configuration, which should now make it possible to mix subsubsections with normal subsections. Signed-off-by: aszlig <aszlig@nix.build>
* modules: Fix eval errors due to wrong test pathsaszlig2021-06-021-1/+3
| | | | | | | | | | | The previous commit introduced a few new eval errors, for example: cannot find attribute `vuizvui.programs.flameshot' This is because the actual attribute path is vuizvui.aszlig.programs.flameshot and not the one above. Signed-off-by: aszlig <aszlig@nix.build>
* modules: Properly link tests to machine configsaszlig2021-06-021-0/+2
| | | | | | | | The PSI and Flameshot tests so far weren't part of the channels of the machines where I use both programs, so if one of those tests would have failed the channels would have advanced regardless of that. Signed-off-by: aszlig <aszlig@nix.build>
* flameshot: Rebase config against version 0.9.0aszlig2021-03-091-16/+8
| | | | | | | | The conflicting changes here are largely because of changed context, except one hunk which is dropped because the "saveAfterCopyPath" no longer existists in version 0.9.0. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/workstation: Add Flameshotaszlig2021-02-132-0/+99
| | | | | | | | | | | So far I've almost exclusively used scrot for screenshots, but most of the time I used an image manipulation program to pixelate stuff, add descriptions or draw arrows. Flameshot combines this in a single application, so I expect that from now on I can spam-post screenshots in even a higher rate than before ;-) Signed-off-by: aszlig <aszlig@nix.build>
* modules/aszlig: Remove Taskwarrior moduleaszlig2020-12-232-84/+0
| | | | | | | | I no longer use Taskwarrior and since my config.patch fails to apply in the most recent release, I think it's time to finally remove it from my workstation profile. Signed-off-by: aszlig <aszlig@nix.build>
* 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>
* 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>
* 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>
* 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>
* modules/zsh: Fix options and clean up a bitaszlig2019-09-221-17/+15
| | | | | | | | | | | | | | | | Since a while ago[1], the setting of ZSH options is now done after interactiveShellInit, so using unsetopt SHARE_HISTORY doesn't work anymore because it is set *afterwards*. Instead of setting these options, we now use the setOptions option instead and override it with exactly the options I want to be set. Additionally, compinit is also no longer necessary, because it is done by default and invoking it on our own is just redundant. [1]: https://github.com/NixOS/nixpkgs/pull/58012 Signed-off-by: aszlig <aszlig@nix.build>
* profiles/workstation: Switch to gopassaszlig2018-04-291-0/+1
| | | | | | | | Even though gopass is more complex than pass, it's also less fragile because it's written in a reasonably type-safe language rather than being a giant shell script that relies on lots of external commands. Signed-off-by: aszlig <aszlig@nix.build>
* Remove my patched version of Gajim everywhereaszlig2018-04-043-881/+0
| | | | | | | | | | | | | | | | | | The config.patch doesn't apply for Gajim 1.0 anymore anyway, so let's throw everything away, including my custom config in order to start with a new abomination. With the new approach, I'm going to patch the configuration defaults *directly* into Gajim, because one of the problems with the old approach was that whenever specifics about a configuration value has changed, I didn't get noticed by a patch failure. So in the end the config I was ending up was a big mess. I'm going to start this with a new unpatched version and someday get to a patched version that I'm staisfied with... hopefully ;-) Signed-off-by: aszlig <aszlig@nix.build>
* programs/gajim: Switch browser to Firefoxaszlig2017-12-111-1/+1
| | | | | | | I no longer use Chromium on a regular basis, so let's open URLs in Firefox instead. Signed-off-by: aszlig <aszlig@nix.build>
* taalo-build: Rewrite as wrapper and move to pkgsaszlig2017-11-121-93/+0
| | | | | | | | | | | | | | | | | | | | We no longer use the legacy SSH store protocol for taalo but the new ssh-ng protocol, which makes the implementation of taalo-build a LOT less clunky. It also didn't make sense to have this as a NixOS module when we after all just emit a static store path without any stuff depending on configuration options. The new implementation basically just wraps nix-build and nix-store -r along with the right NIX_REMOTE variable. With Nix 1.2 this can also be done with the new "nix build" command using the --store option, but unfortunately "nix build" doesn't yet have the same functionality as nix-build. Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch, @bendlas
* modules/aszlig: Change my email addressaszlig2017-10-271-1/+1
| | | | | | | I'm no longer employed by RedMoon Studios, so while I still receive email on this address, it makes more sense to move on to nix.build :-) Signed-off-by: aszlig <aszlig@nix.build>
* Change to new GnuPG keyaszlig2017-10-241-1/+1
| | | | | | | | | | | The previous GnuPG key (4DFD43EC834B6901BDA2BAAC1DE8E48E57DB5436) was subject to the ROCA vulnerability, so I had to revoke it. For details about this vulnerability, please visit: https://crocs.fi.muni.cz/public/papers/rsa_ccs17 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* madules/programs: Remove xpdf moduleaszlig2017-09-021-20/+0
| | | | | | | | | Since version 4.0 of xpdf, the UI has vastly changed and the configuration setting I'm using in this module no longer is necessary for me. So let's drop the module altogether until I'm getting used to the new xpdf and find new things I don't like :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/aszlig: Make vim module a plain packageaszlig2017-07-241-386/+0
| | | | | | | | | | | | I don't use anything that's machine specific within my Vim configuration (and even if, we can pass it via the callPackage arguments) so it's kinda pointless that it's a module instead of a plain package (override). This makes it also easier to nix-build the package without the need to go through the module system. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Convert packageOverrides to overlaysaszlig2017-07-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two other occasions where packageOverrides are still in use, one of them is @sternenseemann's fliewatuet machine and another one is @devhell's package profile. I've replaced every other occurence of packageOverrides and replaced it with overlays and checked the store path hash after evaluation. The reason why I left @sternenseemann's fliewatuet alone was that for I wasn't quite sure whether "bluez = pkgs.bluez5" is still needed or intentional to pin it to version 5. Because if it's not the case the packageOverrides can just be dropped because bluez is already bluez5 in upstream <nixpkgs>. For @devhell's package profile, I did the conversion, but the store path turned out to be a different one than what it was prior to the change. I did take a quick look at the requisites of the drv and found that sox was one of the different paths that led to the change in the final store path. This obviously needs to be tested and/or investigated first. Other than that, the main reason why I'm moving everything to overlays is that it's the replacement for packageOverrides and also has a better way to pass through chains of overrides than packageOverrides had. My guess is that after NixOS 17.09, the old packageOverrides function will be removed, so let's make sure we're ready for that. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell, @sternenseemann
* pkgs: Add an overridden Gajim with old pycryptoaszlig2017-04-231-2/+2
| | | | | | | | This is for the time being until either NixOS/nixpkgs#21671 has been resolved or the next major version of Gajim has been released, because the latter no longer uses pycrypto. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* taalo-build: Use Nix 1.11 for the backendaszlig2017-04-231-1/+10
| | | | | | | | | | | | | | | | | | Nix 1.12 already got rid of most of the Perl stuff so the Perl script backing taalo-build doesn't work anymore because Nix/CopyClosure.pm is no longer available. One way to fix this properly is to part the backend to C++ and use the new ssh-ng store backend. This would also have the advantage that we don't need to hardcode protocol internals here anymore. Unfortunately, Nix 1.12 isn't stable yet and we would break Nix 1.11 if we use the new store API. So that's why I'm pinning the backend to use Nix 1.11 instead and leave that ugly Perl script until Nix 1.2 is stable. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/gajim: Disable tests expected to failaszlig2017-02-071-0/+6
| | | | | | | | | We inject our own declarative config into Gajim by patching the source, which unfortunately kills a few tests which assume the default configuration, especially in terms of the GUI (for example the Vuizvui config has a single window GUI). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/meshuggah: Set cyan color in promptaszlig2017-01-121-1/+13
| | | | | | | | | | | This is mainly to distinguish the prompt color from my workstations so it's clearly obvious that I'm working on meshuggah rather than say mmrnmhrm. We needed to add another option to the zsh module so that we can easily override machine colors for other machines as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Disable mouse supportaszlig2016-11-291-0/+1
| | | | | | | This one is annoying and it seems to be enabled by default in recent Vim versions, so let's get rid of 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>
* 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>
* 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>
* 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>
* taalo-build: Fix picking up derivation pathsaszlig2016-06-051-2/+2
| | | | | | | | | | | | | Regression introduced by fba5c2469bd5e95857c4ffd9db3dd0529f2485f3. The derivation paths returned by nix-instantiate are usually valid store paths, except when used with --add-root. In case of the latter, we get the root symlink back, so we need to do an additional readlink on it. We also now pass -t to mktemp so that $TMPDIR or /tmp is used instead of the current working directory. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Update my GnuPG public keyaszlig2016-06-051-1/+1
| | | | | | | | | | | Time for a new GnuPG key, this time CCID-only :-) This is the last commit you'll get using my old key (which will soon be revoked as soon as I moved everything over to use the new key), so if you're paranoid be sure to check the fingerprint against the signature of this very commit. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Add link to derivation fileaszlig2016-06-041-2/+10
| | | | | | | This is needed to ensure that the .drv file doesn't get garbage collected while we're transferring it to taalo. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Handle multiple outputsaszlig2016-06-041-1/+1
| | | | | | | We need to split off the !output from the derivation name returned by nix-instantiate, because we can't realize such a path. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Update vim-nix to latest masteraszlig2016-06-041-2/+2
| | | | | | Contains a fix for lower/greater than operators (LnL7/vim-nix#9). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Split into realize and buildaszlig2016-05-291-48/+58
| | | | | | | | | | | | | | | With just taalo-build we can't realize plain .drv files, so let's use the Perl part to just realize the derivations given by the command line and provide two shell script wrappers on top of it: * taalo-build: Similar to nix-build * taalo-realize: Similar to nix-store -r Having a command like taalo-realize is very useful if evaluation is done on a different machine and the closure is just copied over to the local machine before being sent to taalo. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/programs/mpv: Fix buildaszlig2016-04-151-0/+1
| | | | | | | | | Since the latest upstream version, the directory $out/etc/mpv doesn't seem to get created anymore, but a quick strace shows that mpv still tries to open it upon startup, so let's just create the directories leading to mpv.conf. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/git: Flesh out type info for Git configaszlig2016-03-011-8/+3
| | | | | | | This now is a little more accurate than providing the name and a propagation of types.unspecified. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Directly connect to taaloaszlig2016-01-191-3/+3
| | | | | | | | As I'm moving away the deployment from mmrnmhrm, it's not a very good idea to rely on the deployment machine being up, which also makes it two machines that need to be up in order to build from tishtushi. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add my own custom xpdf configurationaszlig2016-01-141-0/+20
| | | | | | | | | It's only a very handy keybinding for toggling the outline, because it sometimes gets very annoying if you don't want to go full screen but still don't want that outline eating up space (and no, I don't want to reach for the mouse). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/programs: Add a new "taalo-build" program.aszlig2015-12-141-0/+65
| | | | | | | | | | | | | | | This is primarily for whenever I'm on the road with varying degrees of internet connectivity. What it essentially does is ssh to mmrnmhrm, then ssh to taalo and then run nix-store --serve --write on it. Taalo is the Hydra master of https://headcounter.org/hydra/ and it has remote builds enabled. The script essentially only builds on the remote host but doesn't fetch the builds. The latter can be done if the Hydra is added as a build cache to the local system, which in case of vuizvui is by default. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Indent docbook files with 2 spaces.aszlig2015-12-111-0/+1
| | | | | | | Having 4 spaces indentation for docbook files is going to get a bit too far to the right. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Update vim-nix to latest master.aszlig2015-12-111-2/+2
| | | | | | | This includes a merge of my additional syntax file improvements as well as the addition of a license. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Update vim-nix to latest master.aszlig2015-12-081-2/+2
| | | | | | | | | This contains both (LnL7/vim-nix#1 and LnL7/vim-nix#3) of my syntax-related pull requests. Thanks to @LnL7 for merging. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-08 20:23:37 +0000