aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lazy-lock.json18
-rw-r--r--lua/alpha/lsp/attach.lua2
-rw-r--r--lua/alpha/lsp/mason.lua12
-rw-r--r--lua/alpha/lsp/servers.lua8
-rw-r--r--lua/alpha/test_strategy.lua2
-rw-r--r--lua/plugins/duck.lua12
-rw-r--r--lua/plugins/laravel.lua22
-rw-r--r--lua/plugins/treesitter.lua9
8 files changed, 62 insertions, 23 deletions
diff --git a/lazy-lock.json b/lazy-lock.json
index 2f30637..2503909 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -15,8 +15,9 @@
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"copilot-cmp": { "branch": "master", "commit": "11eb015fbf9f07ad1c72dbdc9d830ebac610b5cd" },
- "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" },
- "dressing.nvim": { "branch": "master", "commit": "b1c7b70e1e0875243ed38f51fe7a61d08e11607e" },
+ "copilot.lua": { "branch": "master", "commit": "2c942f33ba5c621c906e625e00a1bb504b65e2f0" },
+ "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
+ "duck.nvim": { "branch": "main", "commit": "8f18dd79c701698fc150119ef642c1881ce6a538" },
"fzf": { "branch": "master", "commit": "0f50dc848e58b47408713c2c31f2be73287c030a" },
"fzf.vim": { "branch": "master", "commit": "5ab282c2f4a597fa655f39f36e7ee8e97bf51650" },
"git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" },
@@ -32,15 +33,16 @@
"markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "031903fefbf59371502092ef9e22cab9161d90ba" },
- "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" },
+ "mason.nvim": { "branch": "main", "commit": "ee6a7f179ebf8aa9da9d53b1cf1b57d292ea0182" },
"middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
- "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" },
+ "neodev.nvim": { "branch": "main", "commit": "dcd34653b0f1d3e7ea9aeb3e37dc7c8da445c4fe" },
"neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" },
"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": "a52fc6eeec116746110b703381777c46d89d9e27" },
+ "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
+ "nvim-autopairs": { "branch": "master", "commit": "35493556b895f54c129918aca43ae9a63af42a1f" },
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" },
@@ -48,12 +50,12 @@
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
- "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
+ "nvim-lspconfig": { "branch": "master", "commit": "499314f76fa6e8f82f7cfd116578906d61ba2560" },
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
"nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" },
"nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" },
"nvim-transparent": { "branch": "main", "commit": "3af6232c8d39d51062702e875ff6407c1eeb0391" },
- "nvim-treesitter": { "branch": "master", "commit": "17b943e7c5cc2b2db3ac7b5720fbd42e75a00d8d" },
+ "nvim-treesitter": { "branch": "master", "commit": "95d02cdafe704fa5b86eac81f2eb1de3d8f52330" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
"nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" },
"plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
@@ -65,7 +67,7 @@
"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": "3fae9c1e14910e6669bb8ecbb473aba6a9e13b33" },
+ "telescope.nvim": { "branch": "master", "commit": "20a37e43bb43c74c6091f9fea6551af0964ad45a" },
"todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
"trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
"twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" },
diff --git a/lua/alpha/lsp/attach.lua b/lua/alpha/lsp/attach.lua
index 84212a6..e15ad92 100644
--- a/lua/alpha/lsp/attach.lua
+++ b/lua/alpha/lsp/attach.lua
@@ -1,7 +1,7 @@
local telescope_mapper = require "alpha.telescope.mappings"
local filetype_attach = setmetatable({
- php = function(client, bufnr)
+ php = function(_, bufnr)
vim.api.nvim_buf_create_user_command(bufnr, "LspPhpactorReindex", function()
vim.lsp.buf_notify(bufnr, "phpactor/index/reindex", {})
end, {})
diff --git a/lua/alpha/lsp/mason.lua b/lua/alpha/lsp/mason.lua
index 752f6ac..a8c6ce7 100644
--- a/lua/alpha/lsp/mason.lua
+++ b/lua/alpha/lsp/mason.lua
@@ -12,12 +12,12 @@ for server, _ in pairs(servers) do
end
mason_lspconfig.setup {
- ensure_installed = mason_servers,
+ -- ensure_installed = mason_servers,
}
-- filter the list for the ones not globally installed
-require("mason-tool-installer").setup {
- ensure_installed = vim.tbl_filter(function (tool)
- return vim.fn.executable(tool) == 0
- end, require "alpha.lsp.tools"),
-}
+-- require("mason-tool-installer").setup {
+-- ensure_installed = vim.tbl_filter(function (tool)
+-- return vim.fn.executable(tool) == 0
+-- end, require "alpha.lsp.tools"),
+-- }
diff --git a/lua/alpha/lsp/servers.lua b/lua/alpha/lsp/servers.lua
index ab70468..14ec9d3 100644
--- a/lua/alpha/lsp/servers.lua
+++ b/lua/alpha/lsp/servers.lua
@@ -76,7 +76,13 @@ return {
},
}
end,
- ["marksman"] = default,
+ ["omnisharp"] = function()
+ return {
+ cmd = {"OmniSharp"},
+ on_attach = lsp_attach,
+ flags = lsp_flags,
+ }
+ end,
["nil_ls"] = default,
["phpactor"] = function()
return {
diff --git a/lua/alpha/test_strategy.lua b/lua/alpha/test_strategy.lua
index 46aae3c..9a2d34a 100644
--- a/lua/alpha/test_strategy.lua
+++ b/lua/alpha/test_strategy.lua
@@ -51,7 +51,7 @@ local function myStrategy(cmd)
vim.notify("Test run successfully", vim.log.levels.INFO, { title = "Test" })
return
end
- local result = j:stderr_result()
+ local result = j:stderr_result() or j:stdout_result()
-- join result in a single string
result = table.concat(result, "\n")
-- escape / characters
diff --git a/lua/plugins/duck.lua b/lua/plugins/duck.lua
new file mode 100644
index 0000000..a8ff8c1
--- /dev/null
+++ b/lua/plugins/duck.lua
@@ -0,0 +1,12 @@
+return {
+ "tamton-aquib/duck.nvim",
+ keys = {
+ {
+ "<leader>hh",
+ function()
+ require("duck").hatch("🦖", 10)
+ end,
+ { desc = "Spawn dinasours" },
+ },
+ },
+}
diff --git a/lua/plugins/laravel.lua b/lua/plugins/laravel.lua
index 72f8c3e..7defe18 100644
--- a/lua/plugins/laravel.lua
+++ b/lua/plugins/laravel.lua
@@ -18,18 +18,28 @@ return {
desc = "Laravel Application Routes",
},
},
- config = function()
+ init = function()
vim.g.laravel_log_level = "debug"
- require("laravel").setup({
+ end,
+ config = function()
+ local uid = vim.system({ "id", "-u" }, { text = true }):wait().stdout or "1000"
+ local gid = vim.system({ "id", "-g" }, { text = true }):wait().stdout or "1000"
+
+ local user_arg = string.format("%s:%s", vim.trim(uid), vim.trim(gid))
+
+ require("laravel").setup {
route_info = {
position = "top",
},
environment = {
environments = {
- ["ao"] = require("laravel.environment.docker_compose").setup({container_name = "panel-webserver"}),
- }
- }
- })
+ ["ao"] = require("laravel.environment.docker_compose").setup {
+ container_name = "panel-webserver",
+ cmd = { "docker", "compose", "exec", "-u", user_arg, "-it", "panel-webserver" },
+ },
+ },
+ },
+ }
require("telescope").load_extension "laravel"
end,
}
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 35db83a..996b881 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -53,5 +53,14 @@ return {
},
},
},
+ incremental_selection = {
+ enable = true,
+ keymaps = {
+ init_selection = "gnn",
+ node_incremental = "grn",
+ scope_incremental = "grc",
+ node_decremental = "grm",
+ },
+ },
},
}
git.all.ar · elvis.ar