From 0167c8dbb415c689e9631e2317c9102d50dd543c Mon Sep 17 00:00:00 2001
From: nigel barink <nigelbarink@hotmail.com>
Date: Fri, 27 Sep 2024 20:32:53 +0200
Subject: [PATCH] Setting up conform, Adding phpactor lsp

---
 lua/barink/plugins/conform.lua    | 14 ++++++++++++++
 lua/barink/plugins/lsp.lua        |  8 +++++++-
 lua/barink/plugins/tokyonight.lua |  8 ++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lua/barink/plugins/conform.lua b/lua/barink/plugins/conform.lua
index 1b4fa8b..fecf484 100644
--- a/lua/barink/plugins/conform.lua
+++ b/lua/barink/plugins/conform.lua
@@ -16,6 +16,20 @@ return {
     },
     config = function ()
        require("conform").setup()
+       -- Command to run async formatting 
+      vim.api.nvim_create_user_command("Format", function(args)
+      local range = nil
+      if args.count ~= -1 then
+        local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
+        range = {
+          start = { args.line1, 0 },
+          ["end"] = { args.line2, end_line:len() },
+        }
+      end
+          require("conform").format({ async = true, lsp_format = "fallback", range = range })
+       end, { range = true })
+
+
     end
 }
 
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index db41a56..8649746 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -109,6 +109,12 @@ return
                 rust_analyzer = true,
                 jdtls = true,
                 pylsp = true,
+                phpactor = {
+                    init_options = {
+                        ["language_server_phpstan.enabled"] = false,
+                        ["language_server_psalm.enabled"] = false,
+                    }
+                },
                 clangd = {
                 capabilities = capabilities,
                 root_dir = require('lspconfig').util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
@@ -120,7 +126,7 @@ return
                         },
                     }
                 },
-                tsserver = true,
+                ts_ls = true,
                 gopls = true,
                 lua_ls = {
                     settings = {
diff --git a/lua/barink/plugins/tokyonight.lua b/lua/barink/plugins/tokyonight.lua
index deed102..08fbd67 100644
--- a/lua/barink/plugins/tokyonight.lua
+++ b/lua/barink/plugins/tokyonight.lua
@@ -18,13 +18,13 @@
 --     }
 
 return {
-    { 
+    {
     "catppuccin/nvim",
     name="catppuccin",
     priority=1000,
-    config = function () 
+    config = function ()
         require("catppuccin").setup()
-        vim.cmd.colorscheme = "catppuccin"
-    end 
+        vim.cmd ('colorscheme catppuccin-mocha')
+    end
 }
 }