Merge branch 'Windows' of git.barink.dev:Nigel/neovim_config into Windows

lua/barink/after/ftplugin/asm.lua

@@ -1,3 +0,0 @@
-require('lspconfig')['asm_lsp'].setup({
-    capabilities = capabilities
-})

lua/barink/after/ftplugin/bash.lua

@@ -1,3 +0,0 @@
-require('lspconfig')['bashls'].setup({
-    capabilities = capabilities
-})

lua/barink/after/ftplugin/cpp.lua

@@ -1,20 +0,0 @@
-local root_files = {
-    'premake5.lua',
-    '.clang-tidy',
-    '.clang-format',
-    'compile_commands',
-    'compile_commands.json',
-    'compile_flags.txt',
-    'configure.ac',
-    '.git'
-}
-local util = require('lspconfig.util')
-require('lspconfig')['clangd'].setup({
-    capabilities = capabilities,
-    filetypes= { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
-    cmd = { 'clangd' },
-    single_file_support = true,
-    root_dir = function (fname)
-        return util.root_pattern(unpack(root_files))(fname)
-    end
-})

lua/barink/after/ftplugin/go.lua

@@ -1,39 +0,0 @@
-require('lspconfig')['gopls'].setup({
-    capabilities = capabilities
-})
-
-local dap = require("dap")
-
-dap.adapters.delve = {
-  type = 'server',
-  port = '${port}',
-  executable = {
-    command = 'dlv',
-    args = {'dap', '-l', '127.0.0.1:${port}'},
-  }
-}
-
--- https://github.com/go-delve/delve/blob/master/Documentation/usage/dlv_dap.md
-dap.configurations.go = {
-  {
-    type = "delve",
-    name = "Debug",
-    request = "launch",
-    program = "${file}"
-  },
-  {
-    type = "delve",
-    name = "Debug test", -- configuration for debugging test files
-    request = "launch",
-    mode = "test",
-    program = "${file}"
-  },
-  -- works with go.mod packages and sub packages 
-  {
-    type = "delve",
-    name = "Debug test (go.mod)",
-    request = "launch",
-    mode = "test",
-    program = "./${relativeFileDirname}"
-  }
-}

lua/barink/after/ftplugin/java.lua

@@ -1,20 +0,0 @@
-Cmd = 'c:/Users/nigel/Appdata/Local/nvim-data/mason/bin/jdtls.cmd'
-JavaDebug = vim.fn.glob("C:/Users/nigel/AppData/Local/nvim-data/java-debug/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-0.52.0.jar", 1)
-local config = {
-    cmd = {Cmd},
-    root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
-    init_options = {
-        bundles = {
-            JavaDebug
-        }
-    }
-}
-require('jdtls').start_or_attach(config)
-require('jdtls').setup_dap({hotcodreplace='auto'})
-require('jdtls.dap').setup_dap_main_class_configs()
-
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-require('lspconfig')['jdtls'].setup({
-    capabilities = capabilities
-})

lua/barink/after/ftplugin/javascript.lua

@@ -1,3 +0,0 @@
-require('lspconfig')['tsserver'].setup({
-    capabilities = capabilities
-})

lua/barink/after/ftplugin/lua.lua

@@ -1,14 +0,0 @@
-
-
-local lsp = require("lspconfig")
-lsp.lua_ls.setup({
-    capabilities = require('cmp_nvim_lsp').default_capabilities(),
-    settings = {
-        Lua = {
-            diagnostics = {
-                globals = { 'vim' }
-            }
-        }
-    }
-})
-

lua/barink/after/ftplugin/python.lua

@@ -1,6 +0,0 @@
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-require('lspconfig')['pyright'].setup({
-    capabilities = capabilities
-})

lua/barink/after/ftplugin/rust.lua

@@ -1,6 +0,0 @@
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-require('lspconfig')['rust_analyzer'].setup({
-    capabilities = capabilities
-})

lua/barink/after/ftplugin/zig.lua

@@ -1,6 +0,0 @@
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-require('lspconfig')['zls'].setup({
-    capabilities = capabilities
-})

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
 }
 

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,
                 intelephense = true,
                 lua_ls = {

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
 }
 }