2 files changed, 27 insertions, 1 deletions

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index e161e43..9bdb8df 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 
@@ -18,6 +18,32 @@ if [ "${NIX_STORE:-/nix/store}" != "/nix/store" ]; then
   exit 1
 fi
 
+if ! which direnv 2>/dev/null >/dev/null; then
+  cat <<-EOF
+        direnv is needed, please install it
+        EOF
+  exit 1
+fi
+
+if [ -z "$NIXOPS_ENV_LOADED" ]; then
+  cat <<-EOF
+        direnv environment needs to be loaded
+        EOF
+  exit 1
+fi
+
+if [ "$(git config --get include.path)" != "../.gitconfig" ]; then
+  cat <<-EOF
+        it is recommended to include the .gitconfig file into (local) git configuration:
+        git config --local include.path '../.gitconfig'
+        Run this command? [y/N]
+        EOF
+  read y
+  if [ "$y" = "y" -o "$y" = "Y" ]; then
+    git config --local include.path '../.gitconfig'
+  fi
+fi
+
 gpg_keys=$(pass ls Nixops/GPGKeys | sed -e "1d" | cut -d" " -f2)
 for key in $gpg_keys; do
   content=$(pass show Nixops/GPGKeys/$key)
diff --git a/nixops/secrets b/nixops/secrets
-Subproject def4146f0e703ca9a32735fbbc3820d6f9bb22e
+Subproject cfb6165e897cdf8c58b267c7222328e2a645db0