1 files changed, 22 insertions, 10 deletions

diff --git a/.envrc b/.envrc
index 438d807..4718a18 100644
--- a/.envrc
+++ b/.envrc
@@ -1,13 +1,25 @@
 # vim: filetype=bash
-export NIX_PATH=nixpkgs=$(cat $(expand_path nix/sources.json) | jq -r '."nixpkgs-nixops".url')
-NIX_PATH=$NIX_PATH:nixpkgs-nix=$(cat $(expand_path nix/sources.json) | jq -r '."nixpkgs-nix".url')
+export DIRENV_FLAKE_DONT_ADD_SOURCES_ROOT=y
+nix_direnv_watch_file() {
+  nix_watches+=("$@")
+  filtered=()
+  for i in "$@"; do
+    case "$i" in
+      */flake.lock)
+        ;;
+      *)
+        filtered+=("$i")
+    esac
+  done
+  watch_file "${filtered[@]}"
+}
 
-export NIXOPS_ENV_LOADED=1
+if nix eval './deploy#sops-vars-file' 2>/dev/null >/dev/null; then
+  export DEVSHELL_NO_MOTD=1
+  cd deploy
+  use flake . --no-warn-dirty
+  cd ..
+  unset DEVSHELL_NO_MOTD
+fi
 
-PATH_add $(expand_path scripts)
-PATH_add $(expand_path nixops/scripts)
-
-use nix
-watch_file $(expand_path nix/sources.json)
-
-clean_nix_shell
+use flake . --no-warn-dirty