1 files changed, 15 insertions, 36 deletions
diff --git a/default.nix b/default.nix
index b6e85bd..268ff9d 100644
--- a/default.nix
+++ b/default.nix
@@ -1,43 +1,22 @@
 let
-  pkgs = import <nixpkgs> {};
-  rootSrc = pkgs.nix-gitignore.gitignoreSource [] ./.;
-  baseTask = pkgs.stdenv.mkDerivation {
-    name = "dotfiles-task";
-    src = rootSrc;
-    buildInputs = [];
-    phases = "unpackPhase buildPhase";
-    buildPhase = ''
-      echo "ERROR: base task buildPhase not overriden."
-      exit 1
-    '';
-  };
-in with pkgs; with pkgs.stdenv; rec {
-  subtasks = rec {
-    shellcheck = baseTask.overrideAttrs(baseAttrs: {
-      name = "${baseAttrs.name}-shellcheck";
-      buildInputs = baseAttrs.buildInputs ++ [ pkgs.shellcheck ];
-      buildPhase = ''
-        export SHELLCHECK_OPTS="-e SC1090 -e SC1091 -e SC2139"
-        ignored='(encrypted|os-installation.sh|notmuch-post.sh)'
-        find . -type f -name '*.sh' | grep -E -v $ignored | xargs shellcheck
-        touch $out
-      '';
-    });
-    fixme = baseTask.overrideAttrs(baseAttrs:  {
-      name = "${baseAttrs.name}-fixme";
-      buildInputs = baseAttrs.buildInputs ++ [ ag ];
-      buildPhase = ''
-        ag FIXME --ignore default.nix || {
-          touch $out
-        }
-      '';
-    });
+  pkgs = import <nixpkgs> { };
+  rootSrc = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
+
+  utils = import ./nixos/utils.nix {
+    pkgs = pkgs;
+    rootSrc = rootSrc; # FIXME: remove the need for this
+    baseName = "dotfiles";
   };
-  test = baseTask.overrideAttrs(baseAttrs: rec {
+in with pkgs;
+with pkgs.stdenv; rec {
+  test = utils.baseTask.overrideAttrs (baseAttrs: rec {
     name = "${baseAttrs.name}-test";
     buildInputs = [
-      subtasks.shellcheck
-      subtasks.fixme
+      utils.formatNix
+      # subtasks.shellcheck
+      # subtasks.fixme
+      # subtasks.uniqueFeeds
+      # subtasks.formatNix
     ];
     buildPhase = ''
       echo "Ran tests for:"