| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
This now is a little more accurate than providing the name and a
propagation of types.unspecified.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Especially useful if you get a kernel panic and have swapfiles laying
around. This command is actually from the Vim example config file and is
documented in the diff-original-file help of Vim.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Because I'm not using plugin managers and do things manually, I have
missed to source all ftdetect files in order to correctly recognize the
filetypes that are coming with plugins by its suffix.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
For tests I'm using a separate Nix expression, but it's quite useful to
have syntax highlighting for .vader files.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
I want to have the syntax highlighting and indentation rules of @LnL7's
vim-nix (https://github.com/LnL7/vim-nix) - or more exactly my pull
request overhauling the syntax highlighting file (LnL7/vim-nix#1) -
while having everything else from @MarcWeber's vim-addon-nix
(https://github.com/MarcWeber/vim-addon-nix).
At least until both projects hopefully merge :-D
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Among other fixes, this contains a small fix for multiline statements by
@domenkozar, thanks a lot :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Got a bit annoying over time to constantly get command-not-found errors,
so it's time to fix it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
It got bumped to version 2.5.0 in NixOS/nixpkgs@f0d1766.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
This is useful to get an urgency hint as soon as for example a long
running command completes while we're on another terminal and/or
workspace.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This comes with a patch to chainload taskwarrior configs and defaults to
the config supplied by the module. So if we want to play around with
different configuration values, it's easy to do by just adding a
~/.taskrc.
Note that the patch uses nestlevel 2 for ~/.taskrc, because if we would
use the default (1), the default configuration would be applied prior to
parsing ~/.taskrc, which of course would balk our plan.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
We want to ensure that we possibly have only *one* point where we decide
on the path of nixpkgs, so it's easier to switch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Unfortunately, we can't just explicitely override the zsh package and
refer to it in systemPackages, so we need to override it using
nixpkgs.config.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Gets rid of my own crap in the vuizvui pkgs namespace and makes it
easier for other users to selectively use my Vim configuration.
It's still not as fleshed out as I wish it would be, but let's do that
later if needed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Now we no longer pollute the repository root with Gajim (for example in
cfgfiles/) and it's also easier to enable/disable my personal Gajim
config among my own machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|