default.nix: Use shell helper functions from utils.nix

1 files changed, 10 insertions, 21 deletions

diff --git a/default.nix b/default.nix
index cc64016..98d73d4 100644
--- a/default.nix
+++ b/default.nix
@@ -32,33 +32,22 @@ in rec {
         touch $out
       '';
     });
-    shellEnvironment = utils.baseTask.overrideAttrs (baseAttrs: {
-      name = "${baseAttrs.name}-shell-inputs";
-      buildInputs = with pkgs; [
-        gitMinimal
-        git-crypt
-        gettext
-        terraform-providers.digitalocean
-        terraform
-        ansible
-      ];
-      buildPhase = ''
-        echo "Can build shell environment buildInputs!"
-        echo noop > $out
-      '';
-    });
+    shellBuildInputs = with pkgs; [
+      gitMinimal
+      git-crypt
+      gettext
+      terraform-providers.digitalocean
+      terraform
+      ansible
+    ];
   };
   test = utils.test [
     (utils.shellcheck null)
     (utils.fixme null)
+    (utils.shellEnvironmentBuild subtasks.shellBuildInputs)
     utils.formatNix
     subtasks.formatTerraform
     subtasks.dockerComposeLint
-    subtasks.shellEnvironment
   ];
-  # Used in .build.yml to run Bash scripts
-  shell = pkgs.mkShell rec {
-    name = "vps-shell";
-    buildInputs = subtasks.shellEnvironment.buildInputs;
-  };
+  shell = utils.shellEnvironment subtasks.shellBuildInputs;
 }