From 179336c56feb942f369e3cf57e7684ba7037dda4 Mon Sep 17 00:00:00 2001
From: Karthi_CTS <karthi.m@cognizant.com>
Date: Wed, 11 Feb 2026 14:45:03 +0530
Subject: [PATCH 1/2] Update idx-template.nix

---
 qwik-city-vite/idx-template.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/qwik-city-vite/idx-template.nix b/qwik-city-vite/idx-template.nix
index cc43f13..8892043 100644
--- a/qwik-city-vite/idx-template.nix
+++ b/qwik-city-vite/idx-template.nix
@@ -3,8 +3,25 @@
     pkgs.nodejs_20
   ];
   bootstrap = ''
+    set -e
     mkdir -p "$WS_NAME"
     npm create qwik@latest "empty" "$WS_NAME"
+    
+    # Pin @eslint/js to version 9 to avoid conflicts
+    # with eslint-plugin-qwik
+    cd "$WS_NAME"
+    node -e '
+      const fs = require("fs");
+      const path = "package.json";
+      const pkg = JSON.parse(fs.readFileSync(path, "utf-8"));
+      if (pkg.devDependencies && pkg.devDependencies["@eslint/js"]) {
+        console.log("Pinning @eslint/js to ^9.0.0");
+        pkg.devDependencies["@eslint/js"] = "^9.0.0";
+      }
+      fs.writeFileSync(path, JSON.stringify(pkg, null, 2));
+    '
+    cd ..
+    
     mkdir -p "$WS_NAME/.idx/"
     cp -rf ${./icon.png} "$WS_NAME/.idx/icon.png"
     cp -rf ${./dev.nix} "$WS_NAME/.idx/dev.nix"
@@ -19,4 +36,4 @@
 
     cd "$out"; npm install --package-lock-only --ignore-scripts
   '';
-}
\ No newline at end of file
+}

From 7661688ca260b7d7415569ab125159cdf2f98c38 Mon Sep 17 00:00:00 2001
From: Karthi_CTS <karthi.m@cognizant.com>
Date: Wed, 11 Feb 2026 14:45:32 +0530
Subject: [PATCH 2/2] Add Qwik VSCode extension to dev.nix

---
 qwik-city-vite/dev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qwik-city-vite/dev.nix b/qwik-city-vite/dev.nix
index 9098f47..bc0a953 100644
--- a/qwik-city-vite/dev.nix
+++ b/qwik-city-vite/dev.nix
@@ -12,7 +12,7 @@
   idx = {
     # Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
     extensions = [
-      # "vscodevim.vim"
+      "qwik.qwik-vscode"
     ];
     workspace = {
       # Runs when a workspace is first created with this `dev.nix` file