Skip to content

Commit

Permalink
chore: update
Browse files Browse the repository at this point in the history
  • Loading branch information
loctvl842 committed Oct 9, 2024
1 parent 0bfa032 commit e89c808
Show file tree
Hide file tree
Showing 26 changed files with 136 additions and 100 deletions.
35 changes: 18 additions & 17 deletions lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,20 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"codeium.nvim": { "branch": "main", "commit": "aa06fa21dd518a81b84aa468e2f52051cbd45f12" },
"codeium.nvim": { "branch": "main", "commit": "ed65f0a5262c746b2d69a7ae67af7c1da89f94ab" },
"conform.nvim": { "branch": "master", "commit": "50649648851cd0e126dfedd0f3c33b900a6f1ef8" },
"copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" },
"copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" },
"dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
"dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
"emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },
"friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" },
"fzf-lua": { "branch": "main", "commit": "cf4f7e095f679856fa8fe74e1539fb60fa552bdd" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"fzf-lua": { "branch": "main", "commit": "1e03541de4d8a169defe83bb4d7abfba450c63a1" },
"gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
"heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
"hover.nvim": { "branch": "main", "commit": "4339cbbcb572b1934c53dcb66ad4bf6a0abb7918" },
"img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" },
"indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" },
"indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
"jupynium.nvim": { "branch": "master", "commit": "e7d75fb7afb4cc70f571e2b9bde10567b99e51cd" },
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
"llm.nvim": { "branch": "main", "commit": "9832a149bdcf0709433ca9c2c3a1c87460e98d13" },
Expand All @@ -31,36 +32,36 @@
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
"mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" },
"mini.hipatterns": { "branch": "main", "commit": "427712c754bfdccd8da7073576cd8e2586c0fe93" },
"mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" },
"monokai-pro.nvim": { "branch": "master", "commit": "93146b8064be0dbd6d375574a0e4b4b9c3f9be2b" },
"mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" },
"mini.hipatterns": { "branch": "main", "commit": "fdad87bf545aec5210ca9a2c49fddf6284d72d1e" },
"mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" },
"monokai-pro.nvim": { "branch": "master", "commit": "bf3448974745e5fb1c070823970017530b7f5920" },
"neo-tree-diagnostics.nvim": { "branch": "main", "commit": "e00434c3cf8637bcaf70f65c2b9d82b0cc9bd7dc" },
"neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
"neogen": { "branch": "main", "commit": "dc50715c009f89b8111197fd2f282f6042daa7ea" },
"noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" },
"none-ls.nvim": { "branch": "main", "commit": "9b98991e15dce8fc502993e23caac2528b8b667f" },
"noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
"none-ls.nvim": { "branch": "main", "commit": "0e0a940477cc08fa7b1799384a1d668058ed4e61" },
"nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
"nvim": { "branch": "main", "commit": "c9e205fe035d622b3c2d66ee42edf368c0c31fd5" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
"nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
"nvim-lightbulb": { "branch": "master", "commit": "02aacd93b9b2367e6dbdd20f43b525f701faf834" },
"nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" },
"nvim-lspconfig": { "branch": "master", "commit": "dd329912c8d446240584a2dbcd3802af3a19105a" },
"nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" },
"nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-scrollbar": { "branch": "main", "commit": "d09f14aa16c9f2748e77008f9da7b1f76e4e7b85" },
"nvim-treesitter": { "branch": "master", "commit": "621f5901f0b3e762cc4c5ed0f9246cf1495193ad" },
"nvim-treesitter-context": { "branch": "master", "commit": "3d5390c49e3f8fe457b376df2a49aa39d75b7911" },
"nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" },
"nvim-treesitter-context": { "branch": "master", "commit": "78a81c7494e7d1a08dd1200b556933e513fd9f29" },
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
"nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
"persistence.nvim": { "branch": "main", "commit": "c45ff862b53ce07a853a753fb0b33e148dbb99d2" },
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
"promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "a2072fef01645c5b06045f126437ff8e2057ef3c" },
"render-markdown": { "branch": "main", "commit": "a0777ec640acbf455da32aa856922d4187c5c27f" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" },
"render-markdown": { "branch": "main", "commit": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a" },
"statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" },
"tokyonight.nvim": { "branch": "main", "commit": "2cd12582c98a3552032824ffa67fd44b4d81184a" },
"trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" },
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/features/heirline/components.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local Utils = require("beastvim.utils")
local Icons = require("beastvim.tweaks").icons
local config = require("beastvim.features.heirline.config")
local conditions = require("heirline.conditions")
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/features/heirline/init.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
local conditions = require("heirline.conditions")

local Utils = require("beastvim.utils")
local config = require("beastvim.features.heirline.config")

local M = {}
Expand Down
2 changes: 0 additions & 2 deletions lua/beastvim/features/heirline/palette.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
local Utils = require("beastvim.utils")

---@class DefaultHeirlinePalette
local palette = {
yellow = "#ffff00",
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/features/lsp/diagnostics.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local Utils = require("beastvim.utils")
local Icons = require("beastvim.tweaks").icons

---@class LspDiagnosticsOptions
Expand Down
8 changes: 3 additions & 5 deletions lua/beastvim/features/lsp/init.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
local Utils = require("beastvim.utils")

---@class LspServer
---@field opts table
---@field opts? table
---@field enabled? boolean
---@field keys? LazyKeysSpec
---@field capabilities? table
Expand Down Expand Up @@ -88,10 +86,10 @@ function M.setup(opts)
capabilities = vim.deepcopy(capabilities),
}, server_config.opts or {})

if server_opts.on_attach then
if server_config.on_attach then
local function callback(client, bufnr)
if client.name == server then
server_opts.on_attach(client, bufnr)
server_config.on_attach(client, bufnr)
end
end
Utils.lsp.on_attach(callback)
Expand Down
2 changes: 0 additions & 2 deletions lua/beastvim/features/lsp/inlay_hints.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
local Utils = require("beastvim.utils")

---@class LspInlayHintsOptions
---@field enabled boolean

Expand Down
2 changes: 0 additions & 2 deletions lua/beastvim/features/lsp/keymaps.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
local Utils = require("beastvim.utils")

---@class beastvim.features.lsp.keymaps
local M = setmetatable({}, {
__call = function(m, ...)
Expand Down
38 changes: 28 additions & 10 deletions lua/beastvim/features/lsp/lang/python.lua
Original file line number Diff line number Diff line change
Expand Up @@ -96,26 +96,44 @@ return {
"pyrightconfig.json",
},
},
on_attach = function(client, _)
-- `ruff_lsp` does not support hover as well as `pyright`
client.server_capabilities.hoverProvider = true
end,
},
ruff_lsp = {
enabled = false,
keys = {
{
"<leader>lo",
function()
vim.lsp.buf.code_action({
apply = true,
context = {
only = { "source.organizeImports" },
diagnostics = {},
},
})
end,
Utils.lsp.action["source.organizeImports"],
desc = "Organize Imports",
},
},
on_attach = function(client, _)
-- `ruff_lsp` does not support hover as well as `pyright`
client.server_capabilities.hoverProvider = true
client.server_capabilities.hoverProvider = false
end,
},
ruff = {
opts = {
cmd_env = { RUFF_TRACE = "messages" },
init_options = {
settings = {
logLevel = "error",
},
},
},
keys = {
{
"<leader>lo",
Utils.lsp.action["source.organizeImports"],
desc = "Organize Imports",
},
},
on_attach = function(client, _)
-- `ruff_lsp` does not support hover as well as `pyright`
client.server_capabilities.hoverProvider = false
end,
},
},
Expand Down
2 changes: 0 additions & 2 deletions lua/beastvim/features/lsp/ui.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
local Utils = require("beastvim.utils")

---@class beastvim.features.lsp.ui
local M = {}

Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/features/lualine/components.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local Utils = require("beastvim.utils")
local Icons = require("beastvim.tweaks").icons
local palette = require("beastvim.features.lualine.palette")
local config = require("beastvim.features.lualine.config")
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/features/lualine/init.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local Utils = require("beastvim.utils")
local config = require("beastvim.features.lualine.config")

local M = {}
Expand Down
2 changes: 0 additions & 2 deletions lua/beastvim/features/lualine/palette.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
local Utils = require("beastvim.utils")

---@class DefaultLualinePalette
local palette = {
yellow = "#ffff00",
Expand Down
2 changes: 0 additions & 2 deletions lua/beastvim/features/lualine/theme.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
local Utils = require("beastvim.utils")

---@class LualineTheme
local M = setmetatable({}, {
__call = function(m, ...)
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/features/neo-tree/init.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local Utils = require("beastvim.utils")
local Icons = require("beastvim.tweaks.icons")

local config = {
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/plugins/aisync.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
creating a streamlined and innovative development experience.
-- Aisync --
]]
local Utils = require("beastvim.utils")

return {
-- Copilot
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/plugins/coding.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local Utils = require("beastvim.utils")
local Icons = require("beastvim.tweaks").icons

return {
Expand Down
1 change: 0 additions & 1 deletion lua/beastvim/plugins/editor.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local Utils = require("beastvim.utils")
local Icons = require("beastvim.tweaks").icons

return {
Expand Down
70 changes: 36 additions & 34 deletions lua/beastvim/plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,44 @@ return {
servers = {
html = {},
lua_ls = {
settings = {
Lua = {
hint = { enable = true },
diagnostics = {
globals = { "vim" },
},
workspace = {
checkThirdParty = false,
library = {
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
[vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true,
[vim.fn.stdpath("data") .. "/lazy/lazy.nvim/lua/lazy"] = true,
opts = {
settings = {
Lua = {
hint = { enable = true },
diagnostics = {
globals = { "vim" },
},
maxPreload = 100000,
preloadFileSize = 10000,
},
codeLens = {
enable = true,
},
completion = {
callSnippet = "Replace",
},
doc = {
privateName = { "^_" },
},
misc = {
parameters = {
"--log-level=trace",
workspace = {
checkThirdParty = false,
library = {
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
[vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true,
[vim.fn.stdpath("data") .. "/lazy/lazy.nvim/lua/lazy"] = true,
},
maxPreload = 100000,
preloadFileSize = 10000,
},
},
format = {
enable = false,
defaultConfig = {
indent_style = "space",
indent_size = "2",
continuation_indent_size = "2",
codeLens = {
enable = true,
},
completion = {
callSnippet = "Replace",
},
doc = {
privateName = { "^_" },
},
misc = {
parameters = {
"--log-level=trace",
},
},
format = {
enable = false,
defaultConfig = {
indent_style = "space",
indent_size = "2",
continuation_indent_size = "2",
},
},
},
},
Expand Down
2 changes: 0 additions & 2 deletions lua/beastvim/plugins/tools.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
local Utils = require("beastvim.utils")

return {
{
"mg979/vim-visual-multi",
Expand Down
3 changes: 2 additions & 1 deletion lua/beastvim/plugins/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ return {
},
highlight = { enable = true },
indent = { enable = true, disable = { "yaml", "python", "html" } },
incremental_selection = { enable = true },
rainbow = {
enable = true,
query = "rainbow-parens",
Expand All @@ -50,7 +51,7 @@ return {
"nvim-treesitter/nvim-treesitter-context",
event = { "BufReadPost", "BufNewFile", "BufWritePre" },
enabled = true,
opts = { mode = "cursor", max_lines = 3 },
opts = { mode = "cursor", max_lines = 1, zindex = 20 },
keys = {
{ "<leader>tt", "<cmd>TSContextToggle<cr>", desc = "Toggle Treesitter Context" },
},
Expand Down
Loading

0 comments on commit e89c808

Please sign in to comment.