nix: cleanup and update flake

Author: Kranzes

flake.lock

@@ -3,7 +3,6 @@
     flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; };
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     terranix = { url = "github:terranix/terranix"; inputs.nixpkgs.follows = "nixpkgs"; };
-    treefmt-nix.url = "github:numtide/treefmt-nix";
     hercules-ci-effects = { url = "github:hercules-ci/hercules-ci-effects"; inputs.nixpkgs.follows = "nixpkgs"; };
   };
 
@@ -12,10 +11,9 @@
       systems = [ "x86_64-linux" ];
 
       imports = [
-        ./terraform
+        ./terraform/flake-module.nix
         ./nix/development.nix
         ./nix/deployment.nix
-        inputs.hercules-ci-effects.flakeModule
       ];
     };
 }

flake.nix

@@ -1,12 +1,14 @@
 { withSystem, config, inputs, ... }:
 
 {
+  imports = [ inputs.hercules-ci-effects.flakeModule ];
+
   herculesCI = herculesCI: {
     onPush.default.outputs.effects.terraform-deploy = withSystem config.defaultEffectSystem ({ pkgs, config, hci-effects, ... }:
       hci-effects.mkEffect {
         name = "terraform-deploy";
         inputs = [
-          config.packages.terraform-with-plugins
+          config.packages.terraformWithPlugins
           pkgs.rage
           pkgs.age-plugin-yubikey # Needed to encryption
         ];