flake: formatting (#342)

This commit is contained in:
Gaétan Lepage 2023-04-21 10:16:01 +02:00 committed by GitHub
parent 3ad504ed49
commit 52120a891d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -10,12 +10,12 @@
inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
outputs = outputs = {
{ self self,
, nixpkgs nixpkgs,
, flake-utils flake-utils,
, pre-commit-hooks pre-commit-hooks,
, ... ...
} @ inputs: } @ inputs:
with nixpkgs.lib; with nixpkgs.lib;
with builtins; let with builtins; let
@ -43,13 +43,11 @@
flakeOutput = flakeOutput =
flake-utils.lib.eachDefaultSystem flake-utils.lib.eachDefaultSystem
(system: (system: let
let
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs {inherit system;};
extractRustAnalyzer = extractRustAnalyzer = {
{ stdenv stdenv,
, pkgs pkgs,
,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "extract_rust_analyzer"; pname = "extract_rust_analyzer";
@ -67,8 +65,7 @@
''; '';
}; };
extractRustAnalyzerPkg = pkgs.callPackage extractRustAnalyzer {}; extractRustAnalyzerPkg = pkgs.callPackage extractRustAnalyzer {};
in in {
{
checks = checks =
(import ./tests { (import ./tests {
inherit pkgs; inherit pkgs;
@ -100,9 +97,9 @@
}; };
runUpdates = runUpdates =
pkgs.callPackage pkgs.callPackage
({ pkgs ({
, stdenv pkgs,
, stdenv,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "run-updates"; pname = "run-updates";
@ -135,16 +132,15 @@
}; };
}; };
}; };
formatter = formatter = let
let
# We need to exclude the plugins/_sources/* files as they are autogenerated # We need to exclude the plugins/_sources/* files as they are autogenerated
# nix formatter only takes a derivation so we need to make a proxy that passes # nix formatter only takes a derivation so we need to make a proxy that passes
# the correct flags # the correct flags
excludeWrapper = excludeWrapper = {
{ stdenv stdenv,
, alejandra alejandra,
, writeShellScript writeShellScript,
, ... ...
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "alejandra-excludes"; pname = "alejandra-excludes";
@ -152,13 +148,11 @@
dontUnpack = true; dontUnpack = true;
dontBuild = true; dontBuild = true;
installPhase = installPhase = let
let
script = writeShellScript "alejandra-excludes.sh" '' script = writeShellScript "alejandra-excludes.sh" ''
${alejandra}/bin/alejandra --exclude ./plugins/_sources "$@" ${alejandra}/bin/alejandra --exclude ./plugins/_sources "$@"
''; '';
in in ''
''
mkdir -p $out/bin mkdir -p $out/bin
cp ${script} $out/bin/alejandra-excludes cp ${script} $out/bin/alejandra-excludes
''; '';
@ -179,14 +173,12 @@
nixDarwinModules.nixvim = import ./wrappers/darwin.nix modules; nixDarwinModules.nixvim = import ./wrappers/darwin.nix modules;
rawModules.nixvim = nixvimModules; rawModules.nixvim = nixvimModules;
templates = templates = let
let
simple = { simple = {
path = ./templates/simple; path = ./templates/simple;
description = "A simple nix flake template for getting started with nixvim"; description = "A simple nix flake template for getting started with nixvim";
}; };
in in {
{
default = simple; default = simple;
}; };
}; };