From ba86ab27c15f8652f84ee595c03aeea45bd0f2b2 Mon Sep 17 00:00:00 2001
From: Prabhat Maurya <prabhat@zlts.org>
Date: Sat, 25 Jul 2026 23:54:05 +0530
Subject: [PATCH] update

---
 init.lua                        | 28 +++++++++++++++-------------
 lua/user/lsp.lua                |  6 +++---
 lua/user/lsp_servers/dartls.lua |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/init.lua b/init.lua
index d361fe8..caa33f9 100644
--- a/init.lua
+++ b/init.lua
@@ -15,23 +15,25 @@ local packer_bootstrap = ensure_packer()
 -- Load user configuration files
 require("user.options")
 require("user.keymaps")
-require("user.cmp")
-require("user.autopairs")
-require("user.telescope")
-require("user.gruvbox")
-require("user.lsp")
-require("user.typescript-tools")
-require("user.null-ls")
-require("user.treesitter")
-require("user.terminal")
-require("user.markdown")
 require("user.autocmds")
-require("user.files_utils")
 require("user.commands")
-require("user.comment")
-require("user.trouble")
+require("user.files_utils")
+require("user.terminal")
 require("user.android")
 require("user.flutter")
+-- Plugin-dependent modules — wrapped in pcall so init doesn't crash when
+-- plugins aren't installed yet (e.g. during :PackerSync on a fresh setup).
+pcall(require, "user.cmp")
+pcall(require, "user.autopairs")
+pcall(require, "user.telescope")
+pcall(require, "user.gruvbox")
+pcall(require, "user.lsp")
+pcall(require, "user.typescript-tools")
+pcall(require, "user.null-ls")
+pcall(require, "user.treesitter")
+pcall(require, "user.markdown")
+pcall(require, "user.comment")
+pcall(require, "user.trouble")
 
 return require("packer").startup(function(use)
     -- Let packer manage itself
diff --git a/lua/user/lsp.lua b/lua/user/lsp.lua
index eba334f..829cb06 100644
--- a/lua/user/lsp.lua
+++ b/lua/user/lsp.lua
@@ -4,10 +4,10 @@ require("mason-lspconfig").setup({
     -- Remove "jdtls" from here to prevent the 'enable' (nil value) crash
     ensure_installed = {
         "pyright",
-        "ts_ls",
+        "typescript-language-server",
         "marksman",
-        "kotlin_language_server",
-        "svelte",
+        "kotlin-language-server",
+        "svelte-language-server",
         "gopls",
     },
 })
diff --git a/lua/user/lsp_servers/dartls.lua b/lua/user/lsp_servers/dartls.lua
index 74c8ed2..6fa0e18 100644
--- a/lua/user/lsp_servers/dartls.lua
+++ b/lua/user/lsp_servers/dartls.lua
@@ -3,7 +3,7 @@
 
 local function get_dart_sdk_path()
     -- Try Flutter's bundled Dart SDK first
-    local flutter_dart = vim.fn.expand("~/development/flutter/bin/cache/dart-sdk/bin/dart")
+    local flutter_dart = vim.fn.expand("~/flutter/bin/cache/dart-sdk/bin/dart")
     if vim.fn.executable(flutter_dart) == 1 then
         return flutter_dart
     end