more updates

10 files changed, 91 insertions, 167 deletions

diff --git a/lazy-lock.json b/lazy-lock.json
index 1a4ef40..2f30637 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -14,20 +14,18 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
-  "composer.nvim": { "branch": "main", "commit": "ec9537969adc7fc128cfe9c3a9925850455896c8" },
   "copilot-cmp": { "branch": "master", "commit": "11eb015fbf9f07ad1c72dbdc9d830ebac610b5cd" },
   "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" },
-  "dressing.nvim": { "branch": "master", "commit": "c7b035de7f91bb6b62b4308f105c56d1a968b8c5" },
-  "fzf": { "branch": "master", "commit": "f50a7058d6734b8213fb8bbe6a293b2ffd485eed" },
-  "fzf.vim": { "branch": "master", "commit": "811f34b70b60b4df2997e3ba8cd109e7d06d683b" },
+  "dressing.nvim": { "branch": "master", "commit": "b1c7b70e1e0875243ed38f51fe7a61d08e11607e" },
+  "fzf": { "branch": "master", "commit": "0f50dc848e58b47408713c2c31f2be73287c030a" },
+  "fzf.vim": { "branch": "master", "commit": "5ab282c2f4a597fa655f39f36e7ee8e97bf51650" },
   "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" },
-  "gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d927caa075df63bf301d92f874efb72fd22fd3b4" },
   "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
   "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
   "icon-picker.nvim": { "branch": "master", "commit": "e6dca182518eeb7a51470c13605a5bce08a816e4" },
   "image.nvim": { "branch": "main", "commit": "dcabdf47b0b974b61d08eeafa2c519927e37cf27" },
   "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
-  "laravel.nvim": { "branch": "main", "commit": "8f8a0eab84191b1867b2f188cf475e6a05203908" },
   "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
   "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
@@ -38,11 +36,11 @@
   "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
   "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" },
   "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" },
-  "neorg": { "branch": "main", "commit": "064f8f65dd32f4fe728e76acfa3e4e153b121147" },
+  "neorg": { "branch": "main", "commit": "20502e50e9087248f6f8ed8d29fae9c849c1c77f" },
   "noice.nvim": { "branch": "main", "commit": "74c2902146b080035beb19944baf6f014a954720" },
   "nui.nvim": { "branch": "main", "commit": "aa1b4c1e05983ff7debd2b4b2788651db099de2f" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
-  "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
+  "nvim-autopairs": { "branch": "master", "commit": "a52fc6eeec116746110b703381777c46d89d9e27" },
   "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
   "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" },
@@ -54,13 +52,10 @@
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" },
   "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" },
-  "nvim-transparent": { "branch": "main", "commit": "4cf97fc0b1c4a88cf246b2f6facb735a536a558e" },
-  "nvim-treesitter": { "branch": "master", "commit": "691d73287a94e8ed82a383df82aabfe77ab4bcaa" },
+  "nvim-transparent": { "branch": "main", "commit": "3af6232c8d39d51062702e875ff6407c1eeb0391" },
+  "nvim-treesitter": { "branch": "master", "commit": "17b943e7c5cc2b2db3ac7b5720fbd42e75a00d8d" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
-  "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
-  "php-code-actions.nvim": { "branch": "main", "commit": "31831cb7c3227ac00ddc7590b31f11148ff4a81c" },
-  "phpactor.nvim": { "branch": "main", "commit": "0aa4ad09c2024e24d630c0ec616d65396caa39e0" },
-  "playground": { "branch": "master", "commit": "429f3e76cbb1c59fe000b690f7a5bea617b890c0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" },
   "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "refactoring.nvim": { "branch": "master", "commit": "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554" },
@@ -70,8 +65,9 @@
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
-  "telescope.nvim": { "branch": "master", "commit": "2c1ed33a6f6f2db3b69f5421f6b405eda1b07748" },
+  "telescope.nvim": { "branch": "master", "commit": "3fae9c1e14910e6669bb8ecbb473aba6a9e13b33" },
   "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
+  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
   "twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" },
   "vim-blade": { "branch": "master", "commit": "9534101808cc320eef003129a40cab04b026a20c" },
   "vim-dadbod": { "branch": "master", "commit": "7d80bbd11c407a09e0f7b869c38f3dec3902805f" },
diff --git a/lua/alpha/lsp/attach.lua b/lua/alpha/lsp/attach.lua
index fe71a2a..84212a6 100644
--- a/lua/alpha/lsp/attach.lua
+++ b/lua/alpha/lsp/attach.lua
@@ -1,6 +1,12 @@
 local telescope_mapper = require "alpha.telescope.mappings"
 
-local filetype_attach = setmetatable({}, {
+local filetype_attach = setmetatable({
+  php = function(client, bufnr)
+    vim.api.nvim_buf_create_user_command(bufnr, "LspPhpactorReindex", function()
+      vim.lsp.buf_notify(bufnr, "phpactor/index/reindex", {})
+    end, {})
+  end,
+}, {
   __index = function()
     return function() end
   end,
diff --git a/lua/alpha/lsp/servers.lua b/lua/alpha/lsp/servers.lua
index d2233a1..ab70468 100644
--- a/lua/alpha/lsp/servers.lua
+++ b/lua/alpha/lsp/servers.lua
@@ -28,23 +28,23 @@ return {
       flags = lsp_flags,
     }
   end,
-  ["html"] = function ()
+  ["html"] = function()
     local config = {
       on_attach = lsp_attach,
       flags = lsp_flags,
     }
-    if vim.fn.executable("html-languageserver") == 1 then
+    if vim.fn.executable "html-languageserver" == 1 then
       config.cmd = { "html-languageserver", "--stdio" }
     end
 
     return config
   end,
-  ["jsonls"] = function ()
+  ["jsonls"] = function()
     local config = {
       on_attach = lsp_attach,
       flags = lsp_flags,
     }
-    if vim.fn.executable("json-languageserver") == 1 then
+    if vim.fn.executable "json-languageserver" == 1 then
       config.cmd = { "json-languageserver", "--stdio" }
     end
 
@@ -85,8 +85,20 @@ return {
       filetypes = { "php", "cucumber" },
       init_options = {
         ["language_server_worse_reflection.inlay_hints.enable"] = true,
+        ["language_server_worse_reflection.inlay_hints.params"] = true,
         -- ["language_server_worse_reflection.inlay_hints.types"] = true,
-        -- ["language_server_worse_reflection.inlay_hints.params"] = true,
+        ["language_server_configuration.auto_config"] = false,
+        ["code_transform.import_globals"] = true,
+        ["language_server_phpstan.enabled"] = true,
+        ["language_server_phpstan.bin"] = "phpstan",
+      },
+      handlers = {
+        ["textDocument/inlayHint"] = function(err, result, ...)
+          for _, res in ipairs(result) do
+            res.label = res.label .. ": "
+          end
+          vim.lsp.handlers["textDocument/inlayHint"](err, result, ...)
+        end,
       },
     }
   end,
diff --git a/lua/plugins/database.lua b/lua/plugins/database.lua
index 4ffb064..e156510 100644
--- a/lua/plugins/database.lua
+++ b/lua/plugins/database.lua
@@ -22,33 +22,5 @@ return {
         Describe = "PRAGMA table_info({table})",
       },
     }
-
-    vim.g.db_ui_icons = {
-      expanded = {
-        db = "▾ ",
-        buffers = "▾ ",
-        saved_queries = "▾ ",
-        schemas = "▾ ",
-        schema = "▾ פּ",
-        tables = "▾ 藺",
-        table = "▾ ",
-      },
-      collapsed = {
-        db = "▸ ",
-        buffers = "▸ ",
-        saved_queries = "▸ ",
-        schemas = "▸ ",
-        schema = "▸ פּ",
-        tables = "▸ 藺",
-        table = "▸ ",
-      },
-      saved_query = "",
-      new_query = "璘",
-      tables = "離",
-      buffers = "﬘",
-      add_connection = "",
-      connection_ok = "✓",
-      connection_error = "✕",
-    }
   end,
 }
diff --git a/lua/plugins/lazygit.lua b/lua/plugins/lazygit.lua
deleted file mode 100644
index 0320d79..0000000
--- a/lua/plugins/lazygit.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  "kdheepak/lazygit.nvim",
-  enabled = false,
-  keys = { { "<leader>gg", ":LazyGit<cr>" } },
-  config = function()
-    vim.env.GIT_EDITOR = "nvr -cc split --remote-wait +'set bufhidden=wipe'"
-  end,
-}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 0458b7f..1c0a855 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -18,26 +18,6 @@ return {
     "williamboman/mason-lspconfig.nvim",
     "WhoIsSethDaniel/mason-tool-installer.nvim",
     {
-      "lvimuser/lsp-inlayhints.nvim",
-      enabled = false,
-      config = function()
-        require("lsp-inlayhints").setup()
-        vim.api.nvim_create_augroup("LspAttach_inlayhints", {})
-        vim.api.nvim_create_autocmd("LspAttach", {
-          group = "LspAttach_inlayhints",
-          callback = function(args)
-            if not (args.data and args.data.client_id) then
-              return
-            end
-
-            local bufnr = args.buf
-            local client = vim.lsp.get_client_by_id(args.data.client_id)
-            require("lsp-inlayhints").on_attach(client, bufnr, false)
-          end,
-        })
-      end,
-    },
-    {
       "j-hui/fidget.nvim",
       enabled = false,
       opts = {
diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua
index a1d7f47..72f9e13 100644
--- a/lua/plugins/noice.lua
+++ b/lua/plugins/noice.lua
@@ -3,6 +3,7 @@ return {
   dependencies = {
     "MunifTanjim/nui.nvim",
   },
+  event = "VeryLazy",
   opts = {
     lsp = {
       -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
@@ -108,6 +109,14 @@ return {
           find = "Pattern not found",
         },
       },
+      {
+        view = "mini",
+        filter = {
+          event = "msg_show",
+          kind = "",
+          find = "change;"
+        }
+      },
     },
   },
 }
diff --git a/lua/plugins/overseer.lua b/lua/plugins/overseer.lua
deleted file mode 100644
index 634de8b..0000000
--- a/lua/plugins/overseer.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "stevearc/overseer.nvim",
-  enabled = false,
-  config = true,
-}
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index ba55910..35db83a 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -2,94 +2,56 @@ return {
   "nvim-treesitter/nvim-treesitter",
   build = ":TSUpdate",
   dependencies = {
-    "nvim-treesitter/playground",
-    { "nvim-treesitter/nvim-treesitter-refactor", enabled = false },
     "nvim-treesitter/nvim-treesitter-textobjects",
   },
-  config = function()
-    require("nvim-treesitter.configs").setup {
-      ensure_installed = {
-        "bash",
-        "css",
-        "go",
-        "gomod",
-        "html",
-        "javascript",
-        "json",
-        "lua",
-        "luadoc",
-        "markdown",
-        "markdown_inline",
-        "nix",
-        "org",
-        "php",
-        "phpdoc",
-        "query",
-        "rust",
-        "sql",
-        "svelte",
-        "typescript",
-        "regex",
-        "vim",
-        "yaml",
-      },
-      highlight = {
-        enable = true,
-        additional_vim_regex_highlighting = { "org" },
-      },
-      indent = {
-        enable = true,
-      },
-      incremental_selection = {
+  event = "VeryLazy",
+  main = "nvim-treesitter.configs",
+  opts = {
+    ensure_installed = {
+      "bash",
+      "css",
+      "go",
+      "gomod",
+      "html",
+      "javascript",
+      "json",
+      "lua",
+      "luadoc",
+      "markdown",
+      "markdown_inline",
+      "nix",
+      "org",
+      "php",
+      "phpdoc",
+      "query",
+      "rust",
+      "sql",
+      "svelte",
+      "typescript",
+      "regex",
+      "vim",
+      "yaml",
+    },
+    highlight = {
+      enable = true,
+      additional_vim_regex_highlighting = { "org" },
+    },
+    indent = {
+      enable = true,
+    },
+    textobjects = {
+      select = {
         enable = true,
+        lookahead = true,
         keymaps = {
-          init_selection = "gnn",
-          node_incremental = "grn",
-          scope_incremental = "grc",
-          node_decremental = "grm",
+          ["af"] = "@function.outer",
+          ["if"] = "@function.inner",
+          ["ac"] = "@conditional.outer",
+          ["ic"] = "@conditional.inner",
+          ["al"] = "@loop.outer",
+          ["il"] = "@loop.inner",
         },
       },
-      -- refactor = {
-      --   highlight_definitions = { enable = true },
-      --   smart_rename = {
-      --     enable = false,
-      --     keymaps = {
-      --       smart_rename = "trr",
-      --     },
-      --   },
-      -- },
-      textobjects = {
-        select = {
-          enable = true,
-          lookahead = true,
-          keymaps = {
-            ["af"] = "@function.outer",
-            ["if"] = "@function.inner",
-            ["ac"] = "@conditional.outer",
-            ["ic"] = "@conditional.inner",
-            ["al"] = "@loop.outer",
-            ["il"] = "@loop.inner",
-          },
-        },
-      },
-      playground = {
-        enable = true,
-        disable = {},
-        updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
-        persist_queries = false, -- Whether the query persists across vim sessions
-        keybindings = {
-          toggle_query_editor = "o",
-          toggle_hl_groups = "i",
-          toggle_injected_languages = "t",
-          toggle_anonymous_nodes = "a",
-          toggle_language_display = "I",
-          focus_language = "f",
-          unfocus_language = "F",
-          update = "R",
-          goto_node = "<cr>",
-          show_help = "?",
-        },
-      },
-    }
-  end,
+    },
+  },
 }
diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua
index 3f884fe..5a87f26 100644
--- a/lua/plugins/trouble.lua
+++ b/lua/plugins/trouble.lua
@@ -1,6 +1,6 @@
 return {
   "folke/trouble.nvim",
-  enabled = false,
+  enabled = true,
   dependencies = "kyazdani42/nvim-web-devicons",
   keys = { { "<leader><leader>t", "<cmd>TroubleToggle<cr>", desc = "Trouble toggle" } },
   config = true,