1 files changed, 20 insertions, 34 deletions
diff --git a/default.nix b/default.nix
index 039119f..ae37a1f 100644
--- a/default.nix
+++ b/default.nix
@@ -1,37 +1,23 @@
-let pkgs = import <nixpkgs> { };
-in rec {
-  utils = import ./utils.nix {
-    pkgs = pkgs;
-    src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
-    baseName = "vps";
+let
+  niv-sources = import ./nix/sources.nix;
+  pkgs = import niv-sources.nixpkgs { };
+  src = pkgs.nix-gitignore.gitignoreSource [ "!.git" ] ./.;
+  projectBuildInputs = with pkgs; [
+  ];
+in {
+  test = pkgs.stdenv.mkDerivation {
+    inherit src;
+    name = "vps-test";
+    phases = [ "unpackPhase" "buildPhase" ];
+    buildInputs = projectBuildInputs;
+    buildPhase = ''
+      patchShebangs .
+      ./tests.sh
+      touch $out
+    '';
   };
-  subtasks = rec {
-    formatTerraform = utils.baseTask.overrideAttrs (baseAttrs: {
-      name = "${baseAttrs.name}-format-terraform";
-      buildInputs = baseAttrs.buildInputs ++ [ pkgs.terraform ];
-      buildPhase = ''
-        terraform fmt -check=true -diff=true || {
-          echo "Terraform files are unformatted. To fix it, run:"
-          echo "  terraform fmt"
-          exit 1
-        }
-        touch $out
-      '';
-    });
-    shellBuildInputs = with pkgs; [
-      gitMinimal
-      git-crypt
-      gettext
-      terraform-providers.vultr
-      terraform
-    ];
+  shell = pkgs.mkShell {
+    name = "vps-shell";
+    buildInputs = projectBuildInputs;
   };
-  test = utils.test [
-    (utils.shellcheck null)
-    (utils.fixme null)
-    (utils.shellEnvironmentBuild subtasks.shellBuildInputs)
-    (utils.formatNix null)
-    subtasks.formatTerraform
-  ];
-  shell = utils.shellEnvironment subtasks.shellBuildInputs;
 }