From 9a30d3dff5851123f14d50364b47cfeb9d3ac9e2 Mon Sep 17 00:00:00 2001
From: HendrikRauh <114620133+HendrikRauh@users.noreply.github.com>
Date: Sun, 8 Feb 2026 17:04:46 +0100
Subject: [PATCH 1/4] Enhance .envrc for improved Nix environment management
 fallback

---
 .envrc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.envrc b/.envrc
index f9abeb0..a374b41 100644
--- a/.envrc
+++ b/.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
\ No newline at end of file

From ccf44827237dbf112f1204d2c5bbb3c526292db6 Mon Sep 17 00:00:00 2001
From: HendrikRauh <114620133+HendrikRauh@users.noreply.github.com>
Date: Sun, 8 Feb 2026 17:09:30 +0100
Subject: [PATCH 2/4] Add support for 'dart' command in fvm wrapper script

---
 flake.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/flake.nix b/flake.nix
index e921027..d1cda89 100644
--- a/flake.nix
+++ b/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

From b33f5a432b0ccc80638c1e6a9f897f7e5bede3c4 Mon Sep 17 00:00:00 2001
From: HendrikRauh <114620133+HendrikRauh@users.noreply.github.com>
Date: Sun, 8 Feb 2026 17:21:18 +0100
Subject: [PATCH 3/4] Improve error handling in update-flutter-nix.sh by using
 'set -euo pipefail'

---
 update-flutter-nix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update-flutter-nix.sh b/update-flutter-nix.sh
index 53e97be..1f60593 100755
--- a/update-flutter-nix.sh
+++ b/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; }

From 22f92821912646d07e26e5027bae0149722c38ef Mon Sep 17 00:00:00 2001
From: HendrikRauh <114620133+HendrikRauh@users.noreply.github.com>
Date: Sun, 8 Feb 2026 17:36:36 +0100
Subject: [PATCH 4/4] Update .gitignore to include backup files and correct
 directory entry

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88fb8f9..061c296 100644
--- a/.gitignore
+++ b/.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/*