apply treefmt

This commit is contained in:
Jörg Thalheim 2023-10-24 17:34:54 +02:00
parent 8c8bb60d41
commit 3a93a33363
2 changed files with 22 additions and 18 deletions

View File

@ -31,24 +31,26 @@
perSystem = { config, pkgs, ... }: {
treefmt = {
projectRootFile = "flake.nix";
programs.terraform.enable = true;
programs.hclfmt.enable = true;
programs.nixpkgs-fmt.enable = true;
};
packages.default = let
terraformHalal = pkgs.terraform.overrideAttrs (_old: { meta = _old.meta // { license = lib.licenses.free; }; });
in pkgs.mkShell {
packages = [
pkgs.bashInteractive
pkgs.sops
(terraformHalal.withPlugins (p: [
p.netlify
p.hcloud
p.null
p.external
p.local
]))
];
};
packages.default =
let
terraformHalal = pkgs.terraform.overrideAttrs (_old: { meta = _old.meta // { license = lib.licenses.free; }; });
in
pkgs.mkShell {
packages = [
pkgs.bashInteractive
pkgs.sops
(terraformHalal.withPlugins (p: [
p.netlify
p.hcloud
p.null
p.external
p.local
]))
];
};
};
});
}

View File

@ -1,6 +1,8 @@
{ self, lib, ... }: let
{ self, lib, ... }:
let
nixosVars = builtins.fromJSON (builtins.readFile ./nixos-vars.json);
in {
in
{
imports = [
self.nixosModules.nixos-wiki
self.nixosModules.nixos-wiki-backup