| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We no longer need to use extraPostFetch in order to append stuff to
the postFetch phase of fetchzip. Since this got fixed[1], we now get
appropriate warnings during evaluation:
warning: use 'postFetch' instead of 'extraPostFetch' with 'fetchzip'
and 'fetchFromGitHub'.
Neither do we like warnings nor do we like to use workarounds from the
past that got fixed, so let's fix it on our side as well :-)
[1]: https://github.com/NixOS/nixpkgs/pull/173430
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
I know, I know, people don't like the color scheme I use, but I got so
used to it and with the new version generated via ColorTemplates it
messes with me being used to elflord with 16 terminal colors instead of
the GUI colors.
So this patches elflord in such a way that it's consistent with what I
want but still uses the new ColorTemplates version, which for example
comes with nicer colors for vimdiff.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch file was relative to the rustfmt crate within the rustc source
tree, so I added "-d src/tools/rustfmt" as patchFlags to apply the patch
against that subdirectory.
Unfortunately, patchFlags also applies to other patches as well and I
didn't account for that. With current rustfmt from rustc 1.59.0 we have
a patch in nixpkgs, which now fails to apply because of this:
applying patch /nix/store/...-rustfmt-fix-self-tests.patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- a/src/tools/rustfmt/src/ignore_path.rs
|+++ b/src/tools/rustfmt/src/ignore_path.rs
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
To fix this, I changed the paths in config.patch to be relative to the
rustc tree rather than just the rustfmt crate, so the patch should now
apply regardless of whether there are other patches.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
| |
The patch no longer applies because some of the imports got changed in
the context of the diff.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
| |
The version from 2021 certainly is way too old for my desire to crave
new bugs, so let's update it for no particular reason other than gut
feeling.
Oh, well and of course I saw a bunch of OMEMO plugin fixes, so maybe if
you search hard enough you'll find compelling reasons... :-D
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since I do have a lot of projects where I use rustfmt, it gets pretty
tedious to manually run "cargo fmt". Using g:rustfmt_autosave should
make this less tedious but it might annoy me in the future, let's see.
In addition to setting rustfmt I also added a default path for rustc,
which is used whenever there is no rustc in path. This is because I
usually switch between several projects which use different Rust
versions and this way it will use the rustc version that is in PATH
during "nix develop".
For the rustfmt part I also added a small default configuration which
represents my opinion on how I think Rust code should be formatted. The
file is used whenever a project doesn't have a "rustfmt.toml" or
".rustfmt.toml".
Unfortunately, RustFmt is broken in Vim right now[1], so I'm using the
upstream project until the issue has been resolved.
[1]: https://github.com/rust-lang/rust.vim/issues/446
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
| |
This has been renamed[1] to reflect the upstream name and since there is
no alias for the old name, we need to rename it as well to avoid
evaluation errors.
[1]: https://github.com/NixOS/nixpkgs/commit/41574158a07f3c6ab5853b316c2fe7ed18e6354b
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Since Vim version 8.2.3141, the following error is raised during
startup:
Error detected while processing .../share/vim/vim82/plugin/02tlib.vim:
line 109: E1208: -complete used without allowing arguments
The latest version of the tlib plugin provides a fix for the above
error, so I'm updating it to latest master.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
If we use 256 color mode in XTerm, using LightBlue in Vim results in
0x5fd7ff but LightBlue in GUI mode will use 0xadd8e6 which has a low
contrast to the default color (0xbebebe).
Since my eyes are not getting better with age, I decided to go with the
old color code that provides better contrast even though I'm quite happy
with the rest of the "more nuanced" colors.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
| |
While ncurses already has support for detecting direct color terminals,
a lot of applications out there do not yet query terminfo but instead
rely on some shady COLORTERM environment variable. While I don't really
like that approach, patching XTerm to set that variable currently is
better than patching all the applications to query terminfo.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far vim-css-color worked quite well for what I wanted, but after
talking to @devhell about possible alternatives, I stumbled upon
hexokinase and tried it a bit.
One of the gripes I had with things such as colorizer is that it
highlights colors regardless of the file types we're in, which in turn
will also highlight things where the hash character is not a hex value,
for example in Erlang's base notation for integers.
Hexokinase also highlights all file types but first of all, it only
highlights things separated by word boundary and also it's way less
obtrusive because the way I've configured it only the hash character is
highlighted, not the whole color value.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far, the TERM environment variable has been set to xterm-256color,
but in reality newer XTerm versions already supported 24bit colors so
setting this to xterm-direct results in using the right terminfo entry
for our terminal.
To make sure this is really the case, let's explicitly set directColor
to true, because while it is enabled in nixpkgs by default it is however
a compile-time option and could possibly be disabled.
Additionally, Vim is now looking pretty gruesome because my colorscheme
so far has used colors for 16-color terminals and I don't particularly
like the GUI colors. I added a few fixups for the color scheme to
address that.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
While I could have done this simply by setting the
g:markdown_fenced_languages variable, I instead decided it would be a
better idea to use the same language names that GitHub recognises via
their GitHub Flavored Markdown syntax.
Since they're using Linguist, I decided to simply import the YAML file
and try to match them against existing Vim syntax files. That way,
we only need to maintain a blacklist of languages we do not want and
should pretty much get highlighting for all supported languages.
Unfortunately, the "markdown.vim" syntax file sources all of the syntax
files for these languages and so the more languages we include there,
the slower it gets when opening a Markdown file.
Right now, I mostly use this for editing textareas, so let's see how
annoying the slower load time will get and blacklist more languages
later if it bugs me too much.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The file in question actually was a ZIP file, which instead of being
unpacked got directly moved to syntax/fish.vim and in turn caused errors
whenever the filetype was set to "fish".
Instead of just fixing up the ZIP file I switched to a GitHub repository
that seemed to be maintained a lot more (last commit in 2020) than the
one we had so far (last change 2013).
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Vim syntax highlighting plugin file is no longer[1] shipped with
Jinja2 version 3.x, so the build fails accordingly with:
install: cannot stat 'ext/Vim/jinja.vim': No such file or directory
In another upstream pull request[2] one of the project members mentioned
another syntax plugin which apparently seems to be more up to date. This
is what I'm hereby switching to as a replacement.
[1]: https://github.com/pallets/jinja/pull/1196
[2]: https://github.com/pallets/jinja/issues/1007
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is another alias which got introduced in 2018, because the actual
command is "pkg-config" and so the package name containing a dash is
more reasonable.
The reason why I'm doing this is because NixOS VM tests now disallow
aliases and while the evaluation error in question only affected the
"gnupg" test, I decided to change all occurences in the event that we
might want to disallow aliases for things other than VM tests.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @sternenseemann for "opam-env"
|
| |
|
|
|
|
|
|
|
|
|
|
| |
This is mainly to incorporate my latest fix[1] for OMEMO, so in theory
updating the plugins would have been sufficient. However, since I like
to eat the freshest set of new bugs, I also updated everything else
except the theme. The latter seems to be a bit more complicated, since
it changed the way they're building it so I skipped that for now.
[1]: https://github.com/psi-im/plugins/pull/91
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A recent change[1] disabled aliases by default in VM tests and since
libtidy actually has been an alias of html-tidy since 2014 it's a good
idea to use the actual non-aliased packaged.
Since I added my PSI build in 2019, I probably didn't check for whether
the package name in nixpkgs would be different while packaging and only
used the name as reported by CMake, thinking it would work (which it
did).
Disallowing aliases in VM tests however is a good change, so let's use
the real package name.
This should fix the evaluation of the Hydra jobset.
[1]: https://github.com/NixOS/nixpkgs/commit/3edde6562e19698da69a499881e0a2e4f5a497a2
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
| |
Upstream is deprecating `stdenv.lib`, so let’s do the same.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7b8164be35c9d82d6e7389a407150a9128f7fb0c.
From the upstream changelog:
> This is an important bugfix release that should resolve several
> outstanding issues and concerns. Since 1.10.0 was released was engaged
> in a lot of discussions and realized that compatibility is more
> important than we first thought. So we're rolling back some breaking
> changes and revise some parts of our roadmap. We will strive to remain
> compatible with other password store implementations - but remember
> this is a goal, not a promise. This means we'll continue using
> compatible secrets formats as well as GPG and Git.
As mentioned in the original commit, I'm still not entirely convinced
that my use case has a future with gopass, their decision to roll back
some of the breaking changes at least makes it possible for me to
upgrade to the latest upstream version without the fear of being locked
in into some gopass-specific format.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
One thing that has annoyed me since quite a while but ultimately didn't
fix yet, was that the urgency hint was only set for one millisecond.
I don't know how this would look like in a desktop environment, but in
my environment the corresponding workspace only flashes red and then
turns back to blue (the default color) whenever I get a new message.
Since I do not constantly switch to Psi to check whether there is
something new, I sometimes responded very late to messages even though I
didn't want to (eg. not actively working on something).
Of course, I also don't want to be interrupted when I'm actually in
zone, but luckily the way urgency hints are displayed in my environment
is pretty unobtrusive and there is no flashing, blinking or even sounds.
So the only difference is that I do not need to switch to Psi anymore,
to check whether there are new messages.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a common pattern I encounter on a daily basis, which involves
copy & pasting the store path of a failed build to "nix log".
Now the same is just a matter of running "nlast" and we get rid of the
useless copy & paste.
The way we do this does have a small goof: Using mtime (or really any
time, other than atime, which commonly is disabled) is not going to work
if we *repeat* an older Nix build, since this will only change the log
file but the prefix directory will be unchanged.
Since addressing this goof would most likely result in iterating through
*all* log files, I'm not doing it since I think it doesn't occur very
often in practice. If I happen to be wrong on that, we could still go
for the heavyweight solution.
Also, I went for implementing this in Python instead of a shell script,
because the latter would not only be less readable but also way slower
since we need to either fork out for every stat command or use ls and
head to figure out the newest file.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
| |
No particular reason, other than current Psi version "feeling" too old
and I'm feeling somewhat adventurous.
The usrsctp library is now needed for Jingle, so I added a small build
of it directly from master as well. Who wants old release versions,
right?
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
| |
Added this when contributing to a GDScript project and since I know a
few persons who implement their games using Godot, I might need to write
GDScript at some point in the future again, so the syntax highlighting
plugin comes in handy.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is actually needed to build the axbo program, which I have rarely
used during the past years. However, I'm not absolutely sure that I
won't be using this again so I decided to fix it, since all that needed
to be done is take an additional patch from Debian that fixes
compatibility with newer JDK versions.
Since the patch changes configure.in and Makefile.am, we need to
regenerate all the files for autotools as well and since there were old
m4 files laying around I deleted them in preAutoreconf.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Version 1.10.X switches the default to new MIME-based format which
breaks interoperability with pass and other implementations.
I'd gladly switch to that format, but the 1.10.0 changelog also
announces plans to remove support for GnuPG and Git in the long term:
> The goal is to remove the support for multiple backends and any
> external dependencies, including git and gpg binaries.
GnuPG and Git support is the reason why I started using pass and
ultimately switched to gopass. If the latter stops being a viable
password manager, switching back to pass will be much harder with the
new MIME format.
There is also an upstream issue[1] about this and while I haven't read
through *all* the comments, other people seem to have similar reasons
for switching to gopass.
So far however I'm not convinced that my use case will have a future
with gopass, so I'll stay at 1.9.x until I've had the time to properly
research other options or maybe even stay with gopass (and go all-in
with the new MIME format).
[1]: https://github.com/gopasspw/gopass/issues/1365
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
For translations there is a nice web interface called Pontoon[1], which
should it make conventient to edit translations.
However, for developers like me I'd call this quite inconvenient, so I
need a Vim plugin to make it at least more pleasing to look at :-)
[1]: https://github.com/mozilla/pontoon
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
While being at it, let's bump the Nix syntax/indentation plugin to the
latest version, since there are a few quirks that were annoying me since
quite a while but I was too lazy to actually fix.
I haven't checked whether the latest version fixes these quirks since I
don't know them on top of my head, but if it doesn't I surely will
stumble on them soon enough.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
| |
So far I had termencoding set to "ascii", because my terminal was only
really able to display ASCII characters and nothing else.
Since this is no longer the case, we can also get rid of this
restriction in my Vim configuration.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've been using this configuration since years already but so far it has
been residing in ~/.muttrc and I copied to new machines accordingly.
The reason why I didn't add it here was because the config was too ugly
and I never got so far as to properly re-do it.
Unfortunately, the config is still ugly as hell, but at least we now
generate it from a structured Nix format and also the IMAP/SMTP user and
server infos are now retrieved via gopass instead.
This also includes my small prank multipart/alternative filter, which
should hopefully "encourange" recipients to disable HTML
parsing/rendering.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
| |
With the switch to a proper Unicode capable font, we no longer need to
patch gopass and simply can now enjoy a proper tree view and also one
less patch to maintain.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I really don't have a lot of other things to blame for forgetting this
in the first place, but let's just assume that the temperatures here
right now are higher than I'm used[TM] to and thus my brain wasn't
working.
On the other hand while writing this I also took a peek and aparently
it's around 20 degree celsius right now, which would be... well...
... okay, I just forgot about that and I feel ashamed now. Go on!
Nothing to read here!
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The latest master version no longer crashes on Jingle file transfer
requests. So alongside updating to the latest Git version, I also
dropped the patch disabling Jingle.
Another reason for updating is simply because the client version already
feels old (heck, it's been February since the last update) and I'm
really craving for fresh new bugs.
I rebased the patch for the default configuration against current master
with no changes in configuration (only obsolete stuff removed) and fixed
the move of the src/plugins directory to the project's root directory.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
The patch I added to xournal was for keeping the aspect ratio when
annotating PDFs with images. However, looking at xournal++ the aspect
ratio is kept by default when resizing via corners so the patch is not
needed.
Since I don't really care a lot whether it's xournal or xournal++ and as
long as it does the very little things I intend to use it for, I don't
mind if it has too many features for my taste.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
| |
The import list of list.go has changed upstream, so the rebase of this
patch doesn't change anything in its functionality but just makes sure
that it applies against gopass version 1.9.0.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
This is quite useful in CSS files and others to directly highlight the
colours in the actual colour value rather than with the generic colour
of the syntax file.
To make sure we don't break the after/syntax files for Haskell and HTML,
I also changed the way we install those files in the output directory so
that if a file already exists, it is appended to rather than
overwritten.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
| |
We essentially only want to have the ftdetect and syntax files,
everything else is just cruft that is not in any way related to Vim.
Ideally we want to do a whitelist approach instead of the "remove
everything unneeded" we're doing right now, but since I don't want to
refactor the whole Vim expression I'll leave it the dirty[TM] way.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
| |
This probably needs a bit of refinement when it comes to indentation,
but at least we get proper syntax highlighting, which is the main point
here.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
| |
The upstream service was shut down at September 11th 2019, so there
really is no need anymore for this package.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Qt applications are no longer implicitly wrapped since a while[1] and so
we new have to use wrapQtAppsHook instead, which also makes the wrapping
for Psi obsolete.
To make sure we don't run into startup errors again, I added a small VM
test, which checks whether the application starts up properly.
[1]: https://github.com/NixOS/nixpkgs/commit/f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
| |
The current master version contains a number of fixes, one of them I
encountered by myself, which is a crash when changing profile settings.
I've updated the configuration patch accordingly, because a few
(obsolete) settings got removed upstream.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
| |
Both strace and xt are trace log formats, so imposing my own distaste
for overly long line length won't make a difference, as they won't
change their "coding style" ;-)
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
| |
Unfortunately these days I have to debug a lot of PHP code, so having
syntax highlighting (even though the syntax file is pretty terse) and
being able to fold Xdebug traces is quite useful to have.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is from the current 2.0 development version and has most of my own
configuration preferences built-in.
Right now, the theming is pretty much a work in progress and the chat
input currently shows black text on dark grey background, which is quite
a nuisance to use.
Another thing that's currently not working (or just for a very short
amount of time) are window manager urgency hints.
Nevertheless however, I'm already using it as my main XMPP client
despite these issues.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
| |
The pcsclite derivation results in multiple outputs, so let's make sure
we actually get the right path to the library instead of ending up using
that from the "bin" output (which obviously doesn't exist).
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
| |
Constantly getting errors on type hints and "unknown" print() arguments
is very annoying, especially because I almost exclusively use Python 3
nowadays.
Signed-off-by: aszlig <aszlig@nix.build>
|
