add console helpers for colors and printing to util

lib/console.nix

@@ -40,4 +40,7 @@ in {
   colorExt = n: color "48;5;${n}";
 
   chevrons = bold (color colors.magenta ">>>");
+
+  chevronY = bold (color colors.yellow ">");
+  chevronM = bold (color colors.magenta ">");
 }

lib/default.nix

@@ -1,4 +1,4 @@
-{ lib }:
+{lib}:
 with lib;
 let
 
@@ -125,8 +125,42 @@ let
 
   app = program: { type = "app"; program = "${program}"; };
 
+  loadConsole = let
+    console = import ./console.nix { inherit lib; };
+    inherit (console) colors color bold chevrons chevronY chevronM;
+    colorFun = name: ''
+    ${name}()
+    {
+      echo -e "${color colors.${name} "\${1}"}"
+    }
+    '';
+  in ''
+  message()
+  {
+    echo -e "${chevrons} $*"
+  }
+  error_message()
+  {
+    echo -e "${chevrons} ${color colors.red "\${*}"}"
+  }
+  ${unlines (map colorFun (attrNames colors))}
+  bold()
+  {
+      echo -e "${bold "$1"}"
+  }
+  chevrons='${chevrons}'
+  chevronY='${chevronY}'
+  chevronM='${chevronM}'
+  die()
+  {
+    error_message $*
+    exit 1
+  }
+  '';
+
 in {
   inherit
+  lib
   flake-utils
   packageSubpath
   relativePackages
@@ -157,6 +191,7 @@ in {
   overridesVia
   cabalDepPackage
   app
+  loadConsole
   ;
 
   ghcOverlay = import ./ghc-overlay.nix;

lib/release.nix

@@ -1,4 +1,4 @@
-{config, lib, util}: let
+{config, util}: let
 
   inherit (config.internal) pkgs;
 
@@ -7,22 +7,21 @@
   preamble = ''
   #!${pkgs.zsh}/bin/zsh
   setopt err_exit no_unset pipefail
+  ${util.loadConsole}
 
   if [[ $# == 0 ]]
   then
-    echo 'Error: Please specify version'
-    exit 1
+    die 'Please specify version'
   fi
   version="$1"
 
   if ! ${git} diff --quiet
   then
-    echo 'Error: Worktree is dirty'
-    exit 1
+    die 'Worktree is dirty'
   fi
 
   ask() {
-    echo -n ">>> $1 [Yn] "
+    echo -n "$chevrons $1 [Yn] "
     read -q decision || true
     echo ""
     [[ $decision != 'n' ]]
@@ -43,8 +42,7 @@
   if ! ask 'Versions updated. Continue?'
   then
     ${git} reset --hard
-    echo ">>> Aborting."
-    exit 1
+    die "Aborting."
   fi
   ${git} add .
   '';
@@ -67,8 +65,7 @@
   nix run .#release -- -v $version
   if ! ask 'Update CLI version in overrides. Continue?'
   then
-    echo ">>> Aborting."
-    exit 1
+    die "Aborting."
   fi
   ${git} add modules/cli.nix
   ${commitAndTag}

lib/show-overrides.nix

@@ -6,11 +6,8 @@ let
   spec = import ./deps/spec.nix { inherit lib; };
   deps = import ./deps/default.nix { inherit pkgs; };
   console = import ./console.nix { inherit lib; };
-  inherit (console) color bold indent chevrons;
-  inherit (console.colors) magenta blue yellow green;
-
-  chevronY = bold (color yellow ">");
-  chevronM = bold (color magenta ">");
+  inherit (console) color bold indent chevrons chevronY chevronM;
+  inherit (console.colors) blue green;
 
   renderSource = concatStringsSep (bold (color green " -> "));
 

lib/with-config.nix

@@ -139,6 +139,7 @@ let
 
 in basic // {
   inherit
+  config
   paramApp
   types
   packageRel

local.nix

@@ -2,6 +2,8 @@
 
 hix.pro [({config, lib, ...}: let
   pkgs = config.pkgs;
+  util = import ./lib/with-config.nix { inherit config lib util; };
+  release = import ./lib/release.nix { inherit config util; };
 in {
   compiler = "ghc94";
 
@@ -95,8 +97,7 @@ in {
     };
 
     apps = let
-      tests = import ./test/default.nix { inherit (config) pkgs; };
-      util = import ./lib/with-config.nix { inherit config lib util; };
+      tests = import ./test/default.nix { inherit util; };
     in {
 
       test = {
@@ -145,16 +146,12 @@ in {
         program = "${prog}";
       };
 
-      release-nix = let
-        release = import ./lib/release.nix { inherit config lib util; };
-      in {
+      release-nix = {
         type = "app";
         program = "${release.nix}";
       };
 
-      release-all = let
-        release = import ./lib/release.nix { inherit config lib util; };
-      in {
+      release-all = {
         type = "app";
         program = "${release.all}";
       };

test/basic/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "basic-test" ''
     cd ./root

test/bootstrap/test.nix

@@ -1,4 +1,4 @@
-{pkgs}:
+{pkgs, ...}:
 {
   test = pkgs.writeText "bootstrap-test" ''
     cd ./root

test/cross/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "cross-test" ''
     cd ./root

test/default.nix

@@ -1,8 +1,9 @@
-{ pkgs, keep ? false, ... }:
-with builtins;
-with pkgs.lib;
+{ util, keep ? false, ... }:
 let
-  test = name: (import (./. + "/${name}/test.nix") { inherit pkgs; }).test;
+  inherit (util) config lib;
+  inherit (config) pkgs;
+
+  test = name: (import (./. + "/${name}/test.nix") { inherit config util pkgs; }).test;
 
   tests = {
     basic = test "basic";
@@ -27,7 +28,7 @@ let
 
   testA = n: t: "${n} ${t}";
 
-  testsA = concatStringsSep " " (mapAttrsToList testA tests);
+  testsA = lib.concatStringsSep " " (lib.mapAttrsToList testA tests);
 
   ciSkipTests = "ghci-vm service postgres hackage";
 
@@ -49,19 +50,15 @@ in {
   tmpdir=/tmp/hix-test-temp
   if (( $# == 0 ))
   then
-    targets="${toString (attrNames tests)}"
+    targets="${toString (lib.attrNames tests)}"
   else
     targets="$@"
   fi
   typeset -A tests
   set -A tests ${testsA}
   typeset -a vm_tests
   ci_skip_tests=(${ciSkipTests})
-
-  message()
-  {
-    echo -e ">>> $*"
-  }
+  ${util.loadConsole}
 
   fail()
   {

test/deps/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs, ...}:
 {
   test = builtins.toFile "deps-test" ''
     cd ./root

test/ghci-vm/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "ghci-vm-test" ''
     cd ./root

test/ghci/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "ghci-test" ''
     cd ./root

test/hackage/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 let
 
   regular = ''

test/local-prelude/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "local-prelude-test" ''
     cd ./root

test/new-static-github/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "new-static-github-test" ''
     mkdir root

test/new-static/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "new-static-test" ''
     mkdir root

test/new/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "new-test" ''
     mkdir root

test/overrides/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs, ...}:
 with pkgs.lib;
 let
   inherit (pkgs) lib;

test/packages/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 let
 
   targetDep = builtins.toFile "cabal-target-dep" ''

test/postgres/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "postgres-test" ''
     cd ./root

test/service/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "service-test" ''
     cd ./root

test/subdir/test.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "subdir-test" ''
     cd ./root