diff --git a/cleo.darwin.nix b/cleo.darwin.nix
index 3446939..becffa0 100644
--- a/cleo.darwin.nix
+++ b/cleo.darwin.nix
@@ -1,5 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, inputs, ... }: {
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.overlays = [ inputs.nix-vscode-extensions.overlays.default ];
   ids.gids.nixbld = 350;
   security.pam.services.sudo_local.touchIdAuth = true;
 
diff --git a/cleo.home.nix b/cleo.home.nix
index 1721a0b..ef6cf9a 100644
--- a/cleo.home.nix
+++ b/cleo.home.nix
@@ -34,22 +34,22 @@
     enable = true;
     profiles.default = {
       userSettings = builtins.fromJSON (builtins.readFile ./config.vscode.settings.json);
-      extensions = with pkgs.vscode-extensions; [
-        # graphql.vscode-graphql
+      extensions = with pkgs.vscode-marketplace; [
         biomejs.biome
         bbenoist.nix
-        dbaeumer.vscode-eslint
         eamodio.gitlens
-        esbenp.prettier-vscode
+        github.copilot-chat
         graphql.vscode-graphql-syntax
         hashicorp.terraform
         mechatroner.rainbow-csv
-        # mermaidchart.vscode-mermaid-chart
+        mermaidchart.vscode-mermaid-chart
         ms-python.debugpy
         ms-python.python
         ms-python.vscode-pylance
+        oxc.oxc-vscode
         redhat.vscode-xml
-        # typescriptteam.native-preview
+        vscode-icons-team.vscode-icons
+        typescriptteam.native-preview
       ];
     };
   };
diff --git a/config.vscode.settings.json b/config.vscode.settings.json
index 5f1e285..5aa06e9 100644
--- a/config.vscode.settings.json
+++ b/config.vscode.settings.json
@@ -1,6 +1,7 @@
 {
 	"$schema": "vscode://schemas/settings/user",
 	"debug.javascript.autoAttachFilter": "disabled",
+	"editor.insertSpaces": true,
 	"editor.tabSize": 2,
 	"editor.unicodeHighlight.ambiguousCharacters": false,
 	"editor.unicodeHighlight.invisibleCharacters": false,
@@ -52,5 +53,6 @@
 	"oxc.configPath": "/etc/oxlintrc.json",
 	"oxc.disableNestedConfig": true,
 	"js/ts.updateImportsOnFileMove.enabled": "always",
-	"js/ts.experimental.useTsgo": true
+	"js/ts.experimental.useTsgo": true,
+	"workbench.iconTheme": "vscode-icons"
 }
diff --git a/flake.lock b/flake.lock
index cb7cb64..3f31ab2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,6 +79,26 @@
         "type": "github"
       }
     },
+    "nix-vscode-extensions": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773196667,
+        "narHash": "sha256-jFlVopQCfQumeZ6iXTJR/jrFvuS408ReTeLfggNiLLM=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "931b0da906b0bf70162d84074c5085934e64750d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1771969195,
@@ -152,6 +172,7 @@
         "darwin": "darwin",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
+        "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2"
diff --git a/flake.nix b/flake.nix
index ef271a2..3705bd7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nix-vscode-extensions = {
+      url = "github:nix-community/nix-vscode-extensions";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     firefox-addons = {
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -81,6 +86,7 @@
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
+            home-manager.extraSpecialArgs = { inherit inputs; };
             home-manager.users."matthew.bessette" = import ./cleo.home.nix;
             home-manager.backupFileExtension = ".before-nix";
           }
diff --git a/programs.vscode.readme.md b/programs.vscode.readme.md
new file mode 100644
index 0000000..c505ab9
--- /dev/null
+++ b/programs.vscode.readme.md
@@ -0,0 +1,4 @@
+# Troubleshooting
+
+### Extensions not loading
+> The double check ~/.vscode/extensions ONLY has symlinks. If it has a mix, then delete the folder and run update.