From 2701efddda4c775fc5b055855d1f7a55ee97e93c Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 4 Feb 2023 02:30:23 +0100 Subject: [PATCH] chore: add formatter definition to allow nix fmt --- flake.nix | 6 +++--- nix/dev-shell.nix | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index f8e031c..960af85 100644 --- a/flake.nix +++ b/flake.nix @@ -52,9 +52,6 @@ inherit ((colmena.lib.makeHive self.colmena).introspect (x: x)) nodes; } // flake-utils.lib.eachDefaultSystem (system: rec { - checks = import ./nix/checks.nix inputs system; - devShells.default = import ./nix/dev-shell.nix inputs system; - pkgs = import nixpkgs { inherit system; overlays = [ @@ -64,5 +61,8 @@ }; apps = agenix-rekey.defineApps self pkgs self.nodes; + checks = import ./nix/checks.nix inputs system; + devShells.default = import ./nix/dev-shell.nix inputs system; + formatter = pkgs.alejandra; }); } diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix index 339d0b4..e844d33 100644 --- a/nix/dev-shell.nix +++ b/nix/dev-shell.nix @@ -18,13 +18,8 @@ with self.pkgs.${system}; (luajit.withPackages (p: with p; [luacheck])) sumneko-lua-language-server - # GitHub Actions - act - actionlint - python3Packages.pyflakes - shellcheck - # Misc + shellcheck jq pre-commit rage