Merge branch 'master' into login-with-token

.envrc

@@ -1,4 +1,9 @@
 # When nix is available, use the flake for environment management
 if command -v nix &> /dev/null; then
-    use flake
+    if type use_flake &> /dev/null; then
+        use flake
+    else
+        echo "Falling back to nix develop (nix-direnv not available)"
+        eval "$(nix develop --print-env 2>/dev/null || echo 'echo Failed to load nix environment')"
+    fi
 fi

.gitignore

@@ -1,4 +1,5 @@
 # Miscellaneous
+*.bak
 *.class
 *.log
 *.pyc
@@ -6,10 +7,9 @@
 .DS_Store
 .atom/
 .buildlog/
-.direnv
+.direnv/
 .history
 .svn/
-flake.nix.bak
 
 coverage/*
 

flake.nix

@@ -66,6 +66,10 @@
               shift
               exec flutter "$@"
               ;;
+            dart)
+              shift
+              exec dart "$@"
+              ;;
             *)
               echo "fvm wrapper: command '$1' not implemented (using Nix-managed Flutter)" >&2
               exit 1

update-flutter-nix.sh

@@ -3,7 +3,7 @@
 # This script adjusts flake.nix to use the flutter version
 # pinned in .fvmrc. It fetches the appropriate commit hash.
 
-set -e
+set -euo pipefail
 
 for cmd in jq curl sed nix; do
   command -v $cmd >/dev/null 2>&1 || { echo "Error: $cmd is not installed!"; exit 1; }