diff --git a/flake.nix b/flake.nix index d0534e8..0180fa7 100644 --- a/flake.nix +++ b/flake.nix @@ -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 + ])) + ]; + }; }; }); } diff --git a/targets/nixos-wiki2.thalheim.io/configuration.nix b/targets/nixos-wiki2.thalheim.io/configuration.nix index 8e06515..9d8ddab 100644 --- a/targets/nixos-wiki2.thalheim.io/configuration.nix +++ b/targets/nixos-wiki2.thalheim.io/configuration.nix @@ -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