tooling: switch from alejandra to nixfmt
Signed-off-by: Bloxx12 <charlie@charlieroot.dev> Change-Id: I6a6a696436b90e48895139b7e0b59b75c0e64cae
This commit is contained in:
parent
9603b43f34
commit
f4464732e3
7 changed files with 31 additions and 33 deletions
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
sources,
|
||||
}: let
|
||||
inherit (pkgs) lib;
|
||||
helix = pkgs.callPackage ./helix {};
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue