Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/nvim' into win
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Manca committed Dec 27, 2024
2 parents 179198c + 4215be1 commit d56e619
Show file tree
Hide file tree
Showing 10 changed files with 355 additions and 344 deletions.
629 changes: 316 additions & 313 deletions after/ftplugin/java.lua
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ end
vim.opt.rtp:prepend(lazy_path)

if vim.fn.has("gui_running") == 1 then
vim.opt.shadafile = vim.fn.stdpath "state" .. "/shada/gmain.shada"
local nvim_qt_path = "C:/Intel/nvim-qt/share/nvim-qt/runtime"
local nvim_qt_path = "C:/Program Files/neovim-qt 0.2.18/share/nvim-qt/runtime"
vim.opt.rtp:append(nvim_qt_path)
vim.cmd.source(nvim_qt_path .. "/plugin/nvim_gui_shim.vim")

Expand Down
19 changes: 9 additions & 10 deletions lazy-lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,36 @@
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"conform.nvim": { "branch": "master", "commit": "339b3e4519ec49312d34fcfa275aa15bfaa67025" },
"conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" },
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"kurayami.nvim": { "branch": "main", "commit": "cea7998ddbad73aa834e8fb3765711750c40c18a" },
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
"markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" },
"markdown.nvim": { "branch": "main", "commit": "ba6253d9673daf0cf394b87b2c2ecb7630944c7d" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"molten-nvim": { "branch": "main", "commit": "66ee5c0a0fbe3e014b867d04db44592f2d3eb30f" },
"noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
"molten-nvim": { "branch": "main", "commit": "c621baf53459a6c45dfd98dcc11cbba7a7ae9470" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "3b796163591a300a433e25384f2574419e51da1a" },
"nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
"nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" },
"nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
"nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" },
"nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-treesitter": { "branch": "master", "commit": "50947387c20ec3fb8c30b8c1c1a1c39f68deb970" },
"nvim-treesitter": { "branch": "master", "commit": "17678b00fa5c2712890a0ec2e269d0a4de1207df" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ufo": { "branch": "main", "commit": "270ca542dae992ffe40274718c63645217ebc8bf" },
"nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
"otter.nvim": { "branch": "main", "commit": "7edd39c920f7a28ac711a7c658a7cfdfb804bc82" },
"otter.nvim": { "branch": "main", "commit": "e8c662e1aefa8b483cfba6e00729a39a363dcecc" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"quarto-nvim": { "branch": "main", "commit": "1cb2d24d7793241bd43f38e3a6f99a6d11f84458" },
Expand Down
15 changes: 11 additions & 4 deletions lua/plugins/editor/completion.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ return {
},
["<C-S-i>"] = { "snippet_backward", "fallback" },
["<C-Space>"] = { "show", "show_documentation", "hide_documentation" },
["<C-g>"] = { "show_documentation", "hide_documentation" },

cmdline = {
["<C-i>"] = { "select_and_accept", "fallback" },
["<C-Space>"] = { "show", "hide" },
["<C-e>"] = { "cancel" },
},
},
appearance = {
nerd_font_variant = "mono",
Expand All @@ -50,12 +55,15 @@ return {
},
},
},
min_keyword_length = function(ctx)
return ctx.mode == "cmdline" and 2 or 0
end,
},
signature = {
enabled = true,
window = {
border = "rounded",
min_width = 24,
max_width = math.ceil(vim.o.columns * 0.6),
max_height = math.ceil(vim.o.lines * 0.4),
},
},
completion = {
Expand Down Expand Up @@ -94,7 +102,6 @@ return {
window = {
min_width = 24,
scrollbar = false,
border = "rounded",
direction_priority = {
menu_north = { "e", "n", "w", "s" },
menu_south = { "e", "n", "s", "w" },
Expand Down
9 changes: 5 additions & 4 deletions lua/plugins/editor/oil.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ local function default_coloumns(detailed)
return detailed
and {
{ "permissions", highlight = "String" },
{ "mtime", highlight = "Comment" },
{ "size", highlight = "Type" },
{ "mtime", highlight = "Comment" },
{ "size", highlight = "Type" },
"icon",
}
or { "icon" }
or { "icon" }
end

return {
Expand Down Expand Up @@ -149,7 +149,8 @@ return {
local argv = tostring(vim.fn.argv(0))
local stat = vim.loop.fs_stat(argv)

local remote_dir_args = vim.startswith(argv, "ssh") or vim.startswith(argv, "sftp") or vim.startswith(argv, "scp")
local remote_dir_args = vim.startswith(argv, "ssh") or vim.startswith(argv, "sftp") or
vim.startswith(argv, "scp")

if stat and stat.type == "directory" or remote_dir_args then
require("lazy").load { plugins = { p.name } }
Expand Down
2 changes: 1 addition & 1 deletion lua/plugins/editor/telescope.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ return {
---Fzf-native
{
"nvim-telescope/telescope-fzf-native.nvim",
build = "make",
build = "make"
},

---UI-select
Expand Down
18 changes: 9 additions & 9 deletions lua/plugins/lsp/handlers.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ return {
}

---Hover
-- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
-- title = "LSP❭ Hover",
-- border = "rounded",
-- max_height = math.floor(vim.o.lines * 0.4),
-- max_width = math.floor(vim.o.columns * 0.8),
-- })
--
-- ---SignatureHelp
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
title = "LSP❭ Hover",
border = "rounded",
max_height = math.floor(vim.o.lines * 0.4),
max_width = math.floor(vim.o.columns * 0.8),
})

---SignatureHelp
-- vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
-- title = "LSP❭ SignatureHelp",
-- border = "single",
-- border = "rounded",
-- max_width = math.floor(vim.o.columns * 0.6),
-- max_height = math.floor(vim.o.lines * 0.4),
-- close_events = { "CursorMoved", "BufHidden", "InsertCharPre" },
Expand Down
2 changes: 1 addition & 1 deletion lua/plugins/lsp/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ return {
typescriptreact = { "prettier" },
html = { "prettier" },
json = { "prettier" },
yaml = { { "yamlfmt", "prettier" } },
yaml = { "yamlfmt", "prettier" },
-- java = { "google-java-format" },
}

Expand Down
2 changes: 2 additions & 0 deletions spell/it.utf-8.add
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ refertante
LIS
RIS
TCP
ei
wso
Binary file modified spell/it.utf-8.add.spl
View file
Binary file not shown.

0 comments on commit d56e619

Please sign in to comment.