about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* vim: Replace vim-css-color by hexokinaseaszlig2021-07-091-6/+31
| | | | | | | | | | | | | | | | | | 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>
* workstation: Advertise XTerm true color capabilityaszlig2021-07-092-3/+15
| | | | | | | | | | | | | | | | | | 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>
* workstation: Remove "git backport" aliasaszlig2021-07-091-6/+0
| | | | | | | | I haven't used the alias since a long time as it is probably apparent due to the hardcoded "14.04" version of NixOS and given that I didn't update the alias also speaks volumes about how useful it is altogether. Signed-off-by: aszlig <aszlig@nix.build>
* workstation: Switch Git conflict style to diff3aszlig2021-07-091-1/+3
| | | | | | | | | | | | I've been using vimdiff3 as the merge tool for a long time, but while it has worked fine for most conflicts, using diff3 makes the original lines visible which I always viewed in a separate shell rather than inline in the editor. Switching this to diff3 should hopefully make merge conflicts more convenient to solve from now on. Signed-off-by: aszlig <aszlig@nix.build>
* modules/git: Switch to RFC-0042aszlig2021-07-092-28/+40
| | | | | | | | | | | | | | | | | 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>
* vim: Add highlighting for Markdown code blocksaszlig2021-07-091-1/+116
| | | | | | | | | | | | | | | | | | | | | | 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>
* vim: Fix Fish syntax fileaszlig2021-07-091-5/+5
| | | | | | | | | | | | 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>
* pkgs/vim: Switch to vim-css-color from colorizerdevhell2021-07-081-1/+1
| | | | | | The `colorizer` plugin doesn't produce accurate results, so I'll try `vim-css-colors`. It's also looking more maintained than the previous plugin.
* Revert "profiles/packages: Remove nixops for now"devhell2021-07-081-0/+1
| | | | | | | | | I know that both `nixops` and `blender/expat` fixes are in staging, so I'm just reverting this one to ensure that eventually there will be fresh build. Currently `pastel` isn't building, so there's little point in trying to skirt around this. This reverts commit 4f73711332cc2220333dcf3eaccdd74c8cc61e10.
* Revert "profiles/packages: Remove blender temporarily"devhell2021-07-071-0/+1
| | | | | | The dependency issue has been fixed, so back to using Blender! Whoop! This reverts commit 41cc1ddf2c2c0f69737bfe9ca144f0d0d2f3a26c.
* modules/base: Remove diff aliasdevhell2021-07-061-1/+0
| | | | I've gotten used to delta enough to not need the diff alias.
* profiles/packages: Add handlrdevhell2021-07-061-0/+1
| | | | I need something sane to control application/file handling.
* machines/{gunnr,eir}: Force `none` schedulerdevhell2021-07-062-1/+5
| | | | | Without this, the kernel tries to use `mq-deadline` for gunnr. The invocation for eir was wrong anyway, so this should fix it.
* dnyarri: Remove the main user from the audio groupaszlig2021-07-041-7/+1
| | | | | | | | | The user shouldn't have direct access to the /dev/snd/* but go through things such as pulseaudio or pipewire. I added the user to that group back then as a workaround to quickly get something[TM] working, but nowadays it's not needed anymore. Signed-off-by: aszlig <aszlig@nix.build>
* machines/{herja,gunnr}: Remove BFQ IO Schedulerdevhell2021-07-032-2/+0
| | | | | | | | | Both, `herja` and `gunnr` have no spinning rust in them, and so they won't need bfq anymore. According to this old benchmark, the `none` scheduler works overall better for most workloads than other schedulers[1]. [1]: https://www.phoronix.com/scan.php?page=article&item=linux-56-nvme&num=1
* aszlig/vim: Switch to dedicated plugin for Jinja2aszlig2021-07-021-7/+5
| | | | | | | | | | | | | | | | 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>
* profiles/packages: Add gomuksdevhell2021-07-021-0/+1
| | | | Hopefully more sane than `element-desktop`.
* profiles/base: Remove curl aliasdevhell2021-07-011-1/+0
| | | | | So, `xh` is really great, but I was wrong in thinking it's a perfect drop-in replacement for `curl`.
* profiles/packages: Replace sxiv with imvdevhell2021-07-011-1/+1
| | | | | | I enjoyed `sxiv`, but there were a few things that bothered me. I've just discovered `imv` (I think), and really like it's minimalism, despite having pretty much all the features I'd want.
* profiles/packages: Remove blender temporarilydevhell2021-06-301-1/+0
| | | | | It looks like `opencolorio` isn't building. This is unfortunate because I really need Blender actually.
* profiles/packages: Remove nixops for nowdevhell2021-06-301-1/+0
| | | | | | | | | | It's not clear when the `certifi` PR[1] will be merged, and I don't want to have to wait for a new hydra build because of it. `nixopsUnstable` is unusable in its current from due to almost lacking documentation, and so I have little choice but to remove `nixops` right now until `certifi` is merged. [1]:https://github.com/NixOS/nixpkgs/pull/127453
* pkgs/vim: Add mucomplete plugindevhell2021-06-301-0/+7
| | | | | | I've been looking for a good, lightweight, and fast completion engine that also has little or no dependencies. The `mucomplete` plugin seems to fit the bill as I also don't have any fancy requirements.
* machines/sternenseemann/wolfgang: enable grapheme shaping for footsternenseemann2021-06-301-0/+4
| | | | Finally, fish won't crap out if an emoji is pasted
* pkgs/sternenseemann/saneterm: update to 21577c3sternenseemann2021-06-301-2/+2
|
* Revert "profiles/packages: Use nixopsUnstable"devhell2021-06-271-1/+1
| | | | | | | NixOps 2.0 has zero documentation. It's not at all clear how to set this up. Gonna have to revert after all. Great. This reverts commit e8f2190048e98b98c7d47479a44448ee6297dd10.
* profiles/packages: Remove aerc, add notmuchdevhell2021-06-271-1/+1
| | | | | | | | | | | | Aerc didn't turn out to be an improvement. I do like some of its design ideas, but overall it doesn't really make me want to swith away from neomutt. I've sat down and actually went through the pain for trying to configure neomutt's colors properly according to the `tender` colorscheme I've become fond of. It's not perfect since I have to match the closest colors in xterm space, which isn't perfect, and until neomutt has proper color support this will have to do. I've added notmuch to simply find email quickly and be able to tag them.
* pkgs/vim: Add vim-tomldevhell2021-06-271-0/+1
| | | | | | I find myself working more and more with TOML files these days. Unfortunately neither `vim` nor `neovim` upstream have added support for syntax highlighting of TOML files yet.
* profiles/packages: Add gpg-tuidevhell2021-06-271-0/+1
| | | | Finally, a useful frontend.
* dnyarri: Remove hplip backendaszlig2021-06-261-10/+0
| | | | | | | | I no longer have a scanner that requires to have hplip and/or any of the proprietary parts of it, so let's keep it out of the machine configuration. Signed-off-by: aszlig <aszlig@nix.build>
* dnyarri: Tie the Psi XMPP client to workspace 1aszlig2021-06-261-1/+1
| | | | | | | | Workspace one is usually my "communications workspace" and since I've been using Psi as my go-to XMPP client, it's a good idea to add it to that workspace, even though I usually start it on that workspace anyway. Signed-off-by: aszlig <aszlig@nix.build>
* dnyarri: Add identifiers for sound cardsaszlig2021-06-261-0/+12
| | | | | | | | | | | | | I already had this in my configuration.nix for quite some time and it's part of my overly complicated[TM] audio setup where I combine multiple speaker systems into one using two sound cards. Since the mapping depends on the individual channels, it's very much important to address the right sound card. So while I'm re-doing my whole audio setup, I decided to get at least the udev part out of my very messy configuration as a first start. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/packages: Use nixopsUnstabledevhell2021-06-241-1/+1
| | | | Frequent python 2.7 breakages in nixops stable are getting on my nerves.
* machines: Remove slylandroaszlig2021-06-242-55/+0
| | | | | | | | | | | | | | | As mentioned in the initial commit (e73fcff03faed773df2500965cb9c4a4fc), the machine was only temporary as a substitute for tishtushi. Since slylandro had a pretty slow dual core CPU and its own quirks, this was never a long-term solution and for the time being my intentions are to work with dnyarri's new hardware until I have a less annoying setup when I'm on the road again. While writing this message, slylandro just died a gruesome death with "cryptsetup erase", followed by "blkdiscard" on the whole drive. Signed-off-by: aszlig <aszlig@nix.build>
* pkgs/sternenseemann/pass: remove unused patch filesternenseemann2021-06-231-50/+0
|
* Revert "sternenseemann/pass: Revert changes for pass 1.7.4"sternenseemann2021-06-231-8/+3
| | | | | | | This reverts commit 8ee2e8ee99e566f007051b9d1b51f6a14eb7b5f0. pass 1.7.4 is in nixos-unstable now, so these changes are necessary to fix the build of pass.
* machines/eir: Update configdevhell2021-06-231-49/+21
| | | | | | It's been a while since I last used this machine. At some point I need to go through it with a fine-toothed comb, but for now these changes will be enough.
* profiles/packages: Add some more interesting toolsdevhell2021-06-221-1/+3
| | | | | | | `grex`: A command-line tools for generating regular expressions from user-provided test cases `tokei`: A program that allows you to count your code, quickly
* profiles/base: Fix typodevhell2021-06-221-1/+1
|
* profiles/base: Add more shell aliasesdevhell2021-06-221-0/+2
|
* profiles/{base,packages}: Add interesting toolsdevhell2021-06-222-10/+14
| | | | | | | | | These tools are `modern` replacements for the tried and tested, if a bit boring, *NIX tools that we all love. My motivation is to try these tools out for an extended period of time and see how I get on with them. In order to remind myself that a certain tool is installed I've added some aliases. Let's see how this goes.
* profiles/packages: Add aercdevhell2021-06-201-0/+1
| | | | | | I love (neo)mutt to death, but the fact that it still doesn't have modern color support drives nuts. Aerc seems like a viable alternative MUA, so I'll be testing that now for a while.
* devhell/vim: Add colorizer plugindevhell2021-06-201-0/+1
| | | | This helps quite a lot when working with colors.
* profiles/packages: Add cbonsaidevhell2021-06-161-0/+1
| | | | This is oddly calming.
* sternenseemann/pass: Revert changes for pass 1.7.4aszlig2021-06-161-3/+8
| | | | | | | | | | | | | | | | | | This reverts commit 88f3e07f175c813cd33469e426f76d7815dd1389. Since https://github.com/NixOS/nixpkgs/pull/126616 still isn't merged and also not in the current NixOS unstable channel, we run into the following evaluation error: assertion '(dmenuSupport -> (((dmenu != null) && (xdotool != null)) && x11Support))' failed at: (17:1) in file: .../pkgs/tools/security/pass/default.nix I decided to re-revert this change, because the commit in question (which undid the revert) did not specify a good reason for doing so and right now the eval error breaks all machine channels on Hydra. Signed-off-by: aszlig <aszlig@nix.build> Cc: @sternenseemann
* tests/sandbox: Substitute alias for libressl.ncaszlig2021-06-161-1/+1
| | | | | | | | | | | Another one of a series of aliases to rename, similar to the last few commits. Unfortunately, I didn't evaluate the sandbox test to make sure all the references were changed, so I missed the netcat one. This time however, I evaluated the sandbox test with latest nixpkgs and it went without errors. Signed-off-by: aszlig <aszlig@nix.build>
* treewide: Replace xvfb_run with xvfb-runaszlig2021-06-164-8/+8
| | | | | | | | | | | | Another alias that has been introduced not too long ago[1] and now more closely resembles the actual command name. Since NixOS VM tests no longer allow aliases, our sandbox tests did not evaluate anymore. While at it, I also renamed all the other uses of the alias. [1]: https://github.com/NixOS/nixpkgs/commit/726306003af21ade95b1908d1920ce9a0f9815bb Signed-off-by: aszlig <aszlig@nix.build>
* modules/gnupg: Replace pinentry_* with pinentry-*aszlig2021-06-161-3/+3
| | | | | | | | | The pinentry_* variants are all aliases and the actual packages are separated with a dash instead. Since NixOS VM tests no longer allow aliases, we need to use the real package name instead to avoid evaluation errors. Signed-off-by: aszlig <aszlig@nix.build>
* treewide: Replace pkgconfig with pkg-configaszlig2021-06-169-17/+17
| | | | | | | | | | | | | | 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"
* pkgs/profpatsch: Replace s6PortableUtils aliasaszlig2021-06-161-2/+2
| | | | | | | | | | | | | | | | | | Similar to 4701a995cb865c5d7178f574a3eae5872595e768, where I replaced the libtidy alias for html-tidy because it broke evaluation of the PSI test, I found another test for nman which uses an alias. The background is that aliases are now[1] no longer allowed in NixOS VM tests and since "s6PortableUtils" is indirectly referenced, we get an evaluation error on Hydra. Using the unaliased name fixes evaluation and should not change anything in functionality. [1]: https://github.com/NixOS/nixpkgs/commit/3edde6562e19698da69a499881e0a2e4f5a497a2 Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-30 09:30:27 +0000