chore: switch to nixfmt
This commit is contained in:
parent
63058c70e7
commit
857140bbd2
|
@ -67,7 +67,9 @@ in {
|
||||||
${lib.getExe pkgs.pr-tracker} --url "https://pr-tracker.${config.secrets.secrets.global.domains.web}"\
|
${lib.getExe pkgs.pr-tracker} --url "https://pr-tracker.${config.secrets.secrets.global.domains.web}"\
|
||||||
--user-agent "Patricks pr-tracker" \
|
--user-agent "Patricks pr-tracker" \
|
||||||
--path nixpkgs --remote origin \
|
--path nixpkgs --remote origin \
|
||||||
--email-white-list ${config.age.secrets.prTrackerWhiteList.path}
|
--email-white-list ${config.age.secrets.prTrackerWhiteList.path} \
|
||||||
|
--email-address pr-tracker@${config.secrets.secrets.global.domains.mail_public} \
|
||||||
|
--email-server smtp.${config.secrets.secrets.global.domains.mail_public} \
|
||||||
'';
|
'';
|
||||||
EnvironmentFile = config.age.secrets.prTrackerEnv.path;
|
EnvironmentFile = config.age.secrets.prTrackerEnv.path;
|
||||||
|
|
||||||
|
|
|
@ -196,13 +196,15 @@
|
||||||
{
|
{
|
||||||
src = lib.cleanSource ./.;
|
src = lib.cleanSource ./.;
|
||||||
hooks = {
|
hooks = {
|
||||||
alejandra.enable = true;
|
nixfmt = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.nixfmt-rfc-style;
|
||||||
|
};
|
||||||
deadnix.enable = true;
|
deadnix.enable = true;
|
||||||
statix.enable = true;
|
statix.enable = true;
|
||||||
hunspell.enable = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
devShell = import ./nix/devshell.nix inputs system;
|
devShell = import ./nix/devshell.nix inputs system;
|
||||||
formatter = pkgs.alejandra;
|
formatter = pkgs.nixfmt-rfc-style;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
|
@ -1,7 +1,5 @@
|
||||||
{
|
{
|
||||||
self,
|
self,
|
||||||
devshell,
|
|
||||||
agenix-rekey,
|
|
||||||
...
|
...
|
||||||
}: system: let
|
}: system: let
|
||||||
pkgs = self.pkgs.${system};
|
pkgs = self.pkgs.${system};
|
||||||
|
@ -12,11 +10,6 @@ in
|
||||||
# Nix
|
# Nix
|
||||||
nil
|
nil
|
||||||
|
|
||||||
# Lua
|
|
||||||
stylua
|
|
||||||
(luajit.withPackages (p: with p; [luacheck]))
|
|
||||||
lua-language-server
|
|
||||||
|
|
||||||
# Misc
|
# Misc
|
||||||
shellcheck
|
shellcheck
|
||||||
pre-commit
|
pre-commit
|
||||||
|
@ -35,7 +28,7 @@ in
|
||||||
help = "Edit and rekey repository secrets";
|
help = "Edit and rekey repository secrets";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
package = pkgs.alejandra;
|
package = pkgs.nixfmt-rfc-style;
|
||||||
help = "Format nix code";
|
help = "Format nix code";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,11 +12,11 @@ rustPlatform.buildRustPackage {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "patrickdag";
|
owner = "patrickdag";
|
||||||
repo = "pr-tracker";
|
repo = "pr-tracker";
|
||||||
rev = "71547ae3abbfd331a890ca2d5f3572bd92c0cecc";
|
rev = "1be91285705bfdb55656db0835820cb034fe5010";
|
||||||
hash = "sha256-Nq60EQz2TINtA4rkUsgVE4rvZ5O9otD8GXWJYPkiAhs=";
|
hash = "sha256-lPhp3Jq6YM8fi0WS/fJrCHdfdQFs5vdErdE5X80WAHE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-pcIbL/mWhvQpQcVgyeNccW5cnHGKPKBpY9f2eeSrcjk=";
|
cargoHash = "sha256-9bhKtg2g5H4zGn7yVCjTazeXfeoKjtAKAlzkLkCraiw=";
|
||||||
|
|
||||||
nativeBuildInputs = [pkg-config];
|
nativeBuildInputs = [pkg-config];
|
||||||
buildInputs = [openssl systemd];
|
buildInputs = [openssl systemd];
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
protolint.enable = true;
|
protolint.enable = true;
|
||||||
};
|
};
|
||||||
formatting = {
|
formatting = {
|
||||||
alejandra.enable = true;
|
nixfmt.enable = true;
|
||||||
markdownlint.enable = true;
|
markdownlint.enable = true;
|
||||||
shfmt.enable = true;
|
shfmt.enable = true;
|
||||||
};
|
};
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
nil-ls = {
|
nil-ls = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
formatting.command = [(lib.getExe pkgs.alejandra) "--quiet"];
|
formatting.command = [(lib.getExe pkgs.nixfmt-rfc-style) "--quiet"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nixd.enable = true;
|
nixd.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue