about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* pkgs/sternenseemann/mandoc: sync repo and use ingo's patchsternenseemann2021-08-072-95/+126
| | | | https://inbox.vuxu.org/mandoc-tech/c9932669-e9d4-1454-8708-7c8e36967e8e@systemli.org/T/#m445439360d5fbe71849001e39ce1e78a8a7d024f
* pkgs/sterneseemann/shakti: 2021-04-12 -> 2021-07-26sternenseemann2021-08-041-2/+2
|
* Revert "pkgs/vim: Add vim-markdown"devhell2021-08-041-1/+0
| | | | | | | Nevermind, I did test it before adding it, but I didn't test everything, and as it turns out it's not what I hoped it would be. This reverts commit 45894282b28ff8dee8ed7f1a31710ddc6ce275a2.
* pkgs/vim: Add vim-markdowndevhell2021-08-041-0/+1
| | | | | I'm working so much with markdown lately that I'd find it helpful if I didn't have to think of every markdown rule myself.
* profiles/base: Fix ZSH typo, remove sed aliasdevhell2021-08-031-2/+1
| | | | I'm used to `sd` enought now to not forget it in lieu of `sed`.
* profiles/base: Add any-fix-shell, remove tab colorsdevhell2021-08-021-1/+1
| | | | | | | Enabling tab colors like this throws an eval error. Don't have time to look into it right now, so reverting by adding `any-nix-shell` instead, which looks useful since the default bash prompt is rather primitive and gives no info whatsoever.
* devhell/base: Add tab-completion colorsdevhell2021-08-021-0/+1
| | | | | This was annoying me for the longest time, but now I have colors back when ZSH tab completes paths.
* devhell/vim: Add vim-clapdevhell2021-08-021-0/+1
| | | | Looks useful, let's see.
* modules/sternenseemann/saneterm: use `;` as prompt in dashsternenseemann2021-07-301-0/+2
|
* modules/sternenseemann/sway: waste no spacesternenseemann2021-07-301-3/+0
|
* pkgs/vim: Fix color for LightBlue in color schemeaszlig2021-07-271-0/+1
| | | | | | | | | | | | 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>
* pkgs/profpatsch/e: fix by rewriting in rust and execing into blockProfpatsch2021-07-273-15/+38
| | | | | | | | | | | calling `execlineb -c` has unfortunate quoting issues, cause for cornercases like arguments that contain spaces or `"` the result would be a completely broken command line. Instead, let’s do our own block construction in a small rust program (for speed). I tried implementing it in bash first but even prepending spaces to a string is a complete waste of time in that language.
* profiles/packages: Add rustscandevhell2021-07-241-0/+1
| | | | Interesting take on an `nmap` replacement.
* profiles/packages: Add mnamer, keep pipr disableddevhell2021-07-241-1/+2
| | | | | I'm really happy to have found `mnamer`, it's a bit like `beets`, but for TV series and movies.
* workstation: Switch Git diff viewer to deltaaszlig2021-07-222-2/+35
| | | | | | | | | | | | | | | | | | | 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>
* machines/haku: fix double setting of `nix.maxJobs`Profpatsch2021-07-211-1/+0
|
* Revert "machines/gunnre: Disable openssh service"devhell2021-07-201-2/+0
| | | | | | Duh. This reverts commit 2d8ad8d8d158f5c4d1e3085062ec4619a18416c9.
* machines/gunnre: Disable openssh servicedevhell2021-07-201-0/+2
| | | | There's really no need to keep this exposed on the internal network.
* pkgs/profpatsch/backup: more ignored dirsProfpatsch2021-07-191-0/+3
|
* machines/profpatsch/base: set nix maxJobs to autoProfpatsch2021-07-191-0/+2
|
* machines/shiki: reenable virtualbox and fix group nameProfpatsch2021-07-192-2/+2
|
* machines/shiki: Use all cores for nix buildersProfpatsch2021-07-191-1/+0
| | | | | I don’t remember why I set that limit, but it’s kinda silly since nix uses all cores by default.
* pkgs/profpatsch/text-letter: file from stdinProfpatsch2021-07-191-1/+0
|
* machines/shiki: use Possehl Analytics remote builderProfpatsch2021-07-191-5/+5
|
* machines/shiki: use xh instead of httpieProfpatsch2021-07-191-1/+1
|
* shiki: enable dconfProfpatsch2021-07-191-0/+3
|
* profiles/packages: Replace speedtest with librespeeddevhell2021-07-181-1/+1
| | | | The output is a bit cleaner and overall it seems to execute faster.
* pkgs/sternenseemann/saneterm: update to e91ae2bsternenseemann2021-07-151-2/+2
|
* profiles/packages: Add procsdevhell2021-07-141-0/+1
| | | | Neat `ps` alternative.
* profiles/packages: Temporarily disable piprdevhell2021-07-131-1/+1
| | | | Seems that it suffered the same fate as `pastel`, for now.
* profiles/packages: Add a collection of useful toolsdevhell2021-07-101-0/+4
| | | | | | | - `rq` is similar to `jq` but works with more types - `watchexec` is neat to execute stuff on file change - `wuzz` is a bit like burpsuite, but on the commandline - `xsv` is just for CSV and has it's own specific functionality
* profiles/base: Add fixedsys-excelsior fontdevhell2021-07-101-0/+1
| | | | | Always loved this font a little bit. Not as cool as the ultimate oldschool fonts, but still.
* profiles/{base,packages}: Add peep as less replacementdevhell2021-07-102-0/+2
| | | | I don't know why, but I enjoy testing new tools replacing old tools.
* pkgs/vim: Replace vim-css-color with vim-hexokinasedevhell2021-07-101-1/+11
| | | | | | | As @aszlig mentioned earlier, this looks like a better plugin. It does everything I need it to. This commit also enables `termguicolors` which wasn't the case prior, and without it `vim-hexokinase` cannot function properly.
* profiles/services: Add shadowExclude to picomdevhell2021-07-101-0/+6
| | | | I'm not interested in shadows on everything.
* modules/git: Fix reference to Git config fileaszlig2021-07-091-1/+1
| | | | | | | | | | | | | 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>
* workstation: Patch XTerm to set $COLORTERMaszlig2021-07-094-1/+24
| | | | | | | | | | 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>
* modules/core: Fix order of Vuizvui pkgs namespaceaszlig2021-07-091-3/+3
| | | | | | | | | | | | | | So far, we have passed self instead of super to our custom package set, but this makes it very hard when overriding other packages and refering to one of these packages in Vuizvui. To fix this, I not only used mkBefore to make sure that the overlay comes before every other overlay but also using super makes sure that whenever we do overrides in Vuizvui, the package *before* the current overlay is selected instead of possibly running into an infinite recursion. Signed-off-by: aszlig <aszlig@nix.build>
* modules/core: Get rid of "with lib;"aszlig2021-07-091-8/+8
| | | | | | | This makes it hard to do static analysis on the code and it's really not needed here, so let's use lib.X directly. Signed-off-by: aszlig <aszlig@nix.build>
* 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.