nix: format with alejandra

This commit is contained in:
Primrose 2025-02-08 12:05:12 +01:00
parent d5cad148da
commit 95eb4b71e0
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
118 changed files with 1291 additions and 1703 deletions

View file

@ -1,46 +1,34 @@
{
systems,
...
}@inputs:
let
{systems, ...} @ inputs: let
inherit (inputs.nixpkgs) lib;
in
let
devShellOf =
system:
let
pkgs = import inputs.nixpkgs { inherit system; };
in
in let
devShellOf = system: let
pkgs = import inputs.nixpkgs {inherit system;};
in
{
default =
let
pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
src = ./.;
hooks = {
# nix
alejandra.enable = true;
statix.enable = true;
deadnix.enable = true;
default = let
pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
src = ./.;
hooks = {
# nix
alejandra.enable = true;
statix.enable = true;
deadnix.enable = true;
# lua
stylua.enable = true;
# lua
stylua.enable = true;
# toml
taplo.enable = true;
};
# toml
taplo.enable = true;
};
in
};
in
inputs.nixpkgs.legacyPackages.${system}.mkShell {
inherit (pre-commit-check) shellHook;
buildInputs = pre-commit-check.enabledPackages;
};
}
// import ./of-repos.nix { inherit pkgs; }
// import ./of-languages.nix { inherit pkgs; };
in
{
// import ./of-repos.nix {inherit pkgs;}
// import ./of-languages.nix {inherit pkgs;};
in {
devShells = lib.genAttrs systems devShellOf;
}

View file

@ -1,14 +1,9 @@
{ pkgs, ... }:
let
jdk = pkgs.jdk17.override { enableJavaFX = true; };
in
{
{pkgs, ...}: let
jdk = pkgs.jdk17.override {enableJavaFX = true;};
in {
mkShell = pkgs.mkShell {
name = "mkShell";
packages = [ ];
packages = [];
};
rust = pkgs.mkShell {
@ -33,10 +28,10 @@ in
name = "Scala";
packages = [
jdk
(pkgs.sbt.override { jre = jdk; })
(pkgs.scala.override { jre = jdk; })
(pkgs.metals.override { jre = jdk; })
(pkgs.ammonite.override { jre = jdk; })
(pkgs.sbt.override {jre = jdk;})
(pkgs.scala.override {jre = jdk;})
(pkgs.metals.override {jre = jdk;})
(pkgs.ammonite.override {jre = jdk;})
];
JAVA_HOME = "${pkgs.jdk17.home}";
};
@ -74,5 +69,4 @@ in
pkgs.haskell-language-server
];
};
}

View file

@ -1,7 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
coreutils = pkgs.mkShellNoCC {
name = "coreutils";
packages = [
@ -64,5 +61,4 @@
pkgs.wally-cli
];
};
}