flake: allow unfree terraform, treefmt: switch to terraform
This commit is contained in:
parent
ebf93eeb4f
commit
2f354ad448
3 changed files with 9 additions and 5 deletions
|
@ -6,12 +6,12 @@
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
deadnix.enable = true;
|
deadnix.enable = true;
|
||||||
hclfmt.enable = true;
|
|
||||||
nixpkgs-fmt.enable = true;
|
nixpkgs-fmt.enable = true;
|
||||||
prettier.enable = true;
|
prettier.enable = true;
|
||||||
ruff.check = true;
|
ruff.check = true;
|
||||||
ruff.format = true;
|
ruff.format = true;
|
||||||
statix.enable = true;
|
statix.enable = true;
|
||||||
|
terraform.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.mypy = {
|
programs.mypy = {
|
||||||
|
|
|
@ -71,6 +71,13 @@
|
||||||
imports = [ ./dev/treefmt.nix ];
|
imports = [ ./dev/treefmt.nix ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_module.args.pkgs = import inputs.nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||||
|
"terraform"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
checks =
|
checks =
|
||||||
let
|
let
|
||||||
darwinConfigurations = lib.mapAttrs' (name: config: lib.nameValuePair name config.config.system.build.toplevel) ((lib.filterAttrs (_: config: config.pkgs.system == system)) self.darwinConfigurations);
|
darwinConfigurations = lib.mapAttrs' (name: config: lib.nameValuePair name config.config.system.build.toplevel) ((lib.filterAttrs (_: config: config.pkgs.system == system)) self.darwinConfigurations);
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
|
||||||
terraform' = pkgs.terraform.overrideAttrs (_: { meta = { }; });
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
devShells = {
|
devShells = {
|
||||||
terraform = with pkgs; mkShellNoCC {
|
terraform = with pkgs; mkShellNoCC {
|
||||||
packages = [
|
packages = [
|
||||||
(terraform'.withPlugins (p: [
|
(terraform.withPlugins (p: [
|
||||||
p.cloudflare
|
p.cloudflare
|
||||||
p.external
|
p.external
|
||||||
p.hydra
|
p.hydra
|
||||||
|
|
Loading…
Add table
Reference in a new issue