| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Since libgit2 version 1.5.0, sysdir.c is in a subdirectory called
"libgit2", which was made to distinguish the sources from the ones in
the CLI tool and util.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
| |
Gosh, today my brain really doesn't work very well it seems, because I
actually forgot to add the first hunk via "git add -p".
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Regression introduced by 25a077f90a0005b519db071a6b5b4d20bd6d2d45.
I usually let Vim perform a syntax check on the Nix file I'm editing,
which usually displays errors. However, given that the zsh module is one
of my older modules where I did a big "with lib;" over the whole scope,
a nix-instantiate --parse didn't find the missing pkgs argument.
So apart from just fixing the error, I removed the "with lib;" and also
moved from the old lib.overrideDerivation to package.overrideAttrs.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I'm already using zsh-fast-syntax-highlighting since weeks via the
configuration.nix and I actually forgot why I used this implementation
rather than one of the others out there.
However, since I'm also using Nushell[1] on a regular basis, I got quite
used to syntax highlighting so that's why I added it to zsh as well.
[1]: https://www.nushell.sh/
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a major upstream release which deprecates a few of our options
but also made our patch a little longer because the tools we remove are
now defined in multiple places.
The patch itself is pretty much doing the same things as before we do
have one thing that is different, which is that we now create the
savePath directory if it doesn't exist. I do know that this doesn't
necessary need to be a directory but in the way I'm using flameshot it
is, so I don't care ;-)
While at it, I also disabled the checkForUpdates option, because this
has annoyed me for some time and I really don't care if the version is
the latest for a screenshot utility.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I'm already using this config since a few months and since I'm slowly
getting used to it, let's try to make it the default for my workstation
profile.
Unfortunately, libgit2 uses the Git configuration from /etc, but our
configuration is directly patched into Git and not in /etc but in
"${pkgs.git}/etc", so we need to patch libgit2 to use the right
configuration file.
Another goof is that we can't use ${pkgs.delta} directly in our Git
configuration because it would introduce a circular dependency between
Git itself and delta (which uses libgit2 which in turn refers to
"${pkgs.git}/etc"), so for the time being I'm relying on $PATH for
delta.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Regression introduced in 709e45c2a8c231201d3f67c6a954021ca2a5f796.
With that commit I renamed the "config" option to be called "settings",
but not only that, the actual config *file* is now to be found in the
"configFile" option.
Unfortunately I forgot to change that reference, which caused an
evaluation error.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
I no longer use Chromium on a regular basis, so let's open URLs in
Firefox instead.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Contains a fix for lower/greater than operators (LnL7/vim-nix#9).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|