faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tooling: switch from alejandra to nixfmt

Browse source 
Signed-off-by: Bloxx12 <charlie@charlieroot.dev>
Change-Id: I6a6a696436b90e48895139b7e0b59b75c0e64cae
This commit is contained in:
Bloxx12 2025-07-20 00:48:11 +02:00
commit f4464732e3
Signed by: faukah
SSH key fingerprint: SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
7 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/helix/default.nix
View file

@ -1,5 +1,5 @@
{
alejandra,
sources,
basedpyright,
bash-language-server,
callPackage,
@ -61,7 +61,7 @@
toml = formats.toml {};
helix-languages = callPackage ./languages.nix {inherit lib;};
helix-languages = callPackage ./languages.nix {inherit lib sources;};
colorscheme = toml.generate "colorscheme.toml" (import ./colorscheme.nix);
helix-config = {

12
packages/helix/languages.nix
View file

@ -1,21 +1,22 @@
{
fetchFromGitHub,
rustPlatform,
alejandra,
sources,
basedpyright,
bash-language-server,
callPackage,
clang-tools,
cmake-format,
cmake-language-server,
deadnix,
deno,
dprint,
fetchFromGitHub,
formats,
gdb,
kdePackages,
lib,
nil,
ruff,
rustPlatform,
shfmt,
typescript-language-server,
vscode-langservers-extracted,
@ -26,6 +27,8 @@
toml = formats.toml {};
nixfmt = callPackage "${sources.nixfmt}/default.nix" {};
# a newer nil version, for pipes support.
new-nil = nil.overrideAttrs (_: {
version = "unstable-18-07-2025";
@ -233,9 +236,8 @@
nil = {
command = getExe new-nil;
# alejandro
config.nil = {
formatting.command = ["${getExe alejandra}" "-q"];
formatting.command = ["${getExe nixfmt}"];
diagnostics = {
bindingEndHintMinLines = 3;
};