diff --git a/configurations/home-manager/leyla/packages/vscode/default.nix b/configurations/home-manager/leyla/packages/vscode/default.nix
index 6e7887a..3878d94 100644
--- a/configurations/home-manager/leyla/packages/vscode/default.nix
+++ b/configurations/home-manager/leyla/packages/vscode/default.nix
@@ -66,12 +66,8 @@ in {
             # go development
             go.enable = true;
 
-            # ai tooling
-            aiCode = {
-              enable = ai-tooling-enabled;
-              ollamaHost = "http://defiant:11434";
-              inlineCompletion.model = "qwen3:4b";
-            };
+            # claude development
+            claudeDev.enable = ai-tooling-enabled;
 
             # misc extensions
             evenBetterToml.enable = true;
diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index b7da763..8151111 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -218,6 +218,10 @@
 
       acceleration = false;
 
+      environmentVariables = {
+        OLLAMA_KEEP_ALIVE = "24h";
+      };
+
       loadModels = [
         # conversation models
         "llama3.1:8b"
diff --git a/modules/home-manager-modules/programs/vscode/claudeDev.nix b/modules/home-manager-modules/programs/vscode/claudeDev.nix
new file mode 100644
index 0000000..8d5dd75
--- /dev/null
+++ b/modules/home-manager-modules/programs/vscode/claudeDev.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
+  pkgsRepository = pkgsRepositories.open-vsx;
+in {
+  options.programs.vscode.profiles = lib.mkOption {
+    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
+      options = {
+        extraExtensions.claudeDev = {
+          enable = lib.mkEnableOption "should the claude-dev extension for vscode be enabled";
+          extension = lib.mkPackageOption pkgsRepository "claude-dev" {
+            default = ["saoudrizwan" "claude-dev"];
+          };
+        };
+      };
+      config = lib.mkIf config.extraExtensions.claudeDev.enable {
+        extensions = [
+          config.extraExtensions.claudeDev.extension
+        ];
+      };
+    }));
+  };
+}
diff --git a/modules/home-manager-modules/programs/vscode/default.nix b/modules/home-manager-modules/programs/vscode/default.nix
index ea54d4f..a86d0c3 100644
--- a/modules/home-manager-modules/programs/vscode/default.nix
+++ b/modules/home-manager-modules/programs/vscode/default.nix
@@ -18,6 +18,7 @@
     ./openRemoteSsh.nix
     ./astroVscode.nix
     ./vscodeMdx.nix
+    ./claudeDev.nix
     ./nearley.nix
   ];
 }