Skip to content

Commit 3fff889

Browse files
djenseniusdjensenius
authored
Merge pull request #269 from djensenius/undotree-and-lsp-optimizations
Undotree and lsp optimizations
2 parents 3ffabec + 540ac68 commit 3fff889

11 files changed

Lines changed: 99 additions & 57 deletions

‎nvim/lua/plugins/catppuccin.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ return {
6262
enabled = true,
6363
},
6464
telescope = {
65-
enabled = true,
65+
enabled = false,
6666
},
6767
treesitter = true,
6868
which_key = true,

‎nvim/lua/plugins/fzf-lua.lua‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,19 @@ return {
2626
vim.keymap.set("n", "<leader>fzb", require("fzf-lua").buffers, { desc = "Buffers" })
2727
vim.keymap.set("n", "<leader>fzz", require("fzf-lua").global, { desc = "Global" })
2828
vim.keymap.set("n", "<leader>fzk", require("fzf-lua").keymaps, { desc = "Keymaps" })
29+
vim.keymap.set("n", "<leader>fzu", require("fzf-lua").undotree, { desc = "Undotree" })
2930
vim.keymap.set("n", "<leader>fzlr", require("fzf-lua").lsp_references, { desc = "References" })
30-
vim.keymap.set("n", "<leader>fzlD", require("fzf-lua").lsp_references, { desc = "Definitions" })
31+
vim.keymap.set("n", "<leader>fzlD", require("fzf-lua").lsp_definitions, { desc = "Definitions" })
3132
vim.keymap.set("n", "<leader>fzlc", require("fzf-lua").lsp_declarations, { desc = "Declarations" })
3233
vim.keymap.set("n", "<leader>fzlt", require("fzf-lua").lsp_typedefs, { desc = "Type Definitions" })
34+
vim.keymap.set("n", "<leader>ff", require("fzf-lua").files, { desc = "Files" })
35+
vim.keymap.set("n", "<leader>fg", require("fzf-lua").live_grep, { desc = "Live grep" })
36+
vim.keymap.set("n", "<leader>fb", require("fzf-lua").buffers, { desc = "Buffers" })
37+
vim.keymap.set("n", "<leader>fh", require("fzf-lua").help_tags, { desc = "Help tags" })
38+
vim.keymap.set("n", "<leader>fd", function()
39+
require("fzf-lua").lsp_definitions({ jump1 = false })
40+
end, { desc = "Definitions" })
41+
vim.keymap.set("n", "<leader>fr", require("fzf-lua").lsp_references, { desc = "References" })
3342
require("fzf-lua").register_ui_select()
3443
end,
3544
}

‎nvim/lua/plugins/lazydev.lua‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
return {
2+
{
3+
"folke/lazydev.nvim",
4+
ft = "lua", -- only load on lua files
5+
opts = {
6+
library = {
7+
-- See the configuration section for more details
8+
-- Load luvit types when the `vim.uv` word is found
9+
{ path = "luvit-meta/library", words = { "vim%.uv" } },
10+
},
11+
},
12+
},
13+
{ "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings
14+
}

‎nvim/lua/plugins/neogit.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ return {
33
event = "VeryLazy",
44
dependencies = {
55
"nvim-lua/plenary.nvim", -- required
6-
"nvim-telescope/telescope.nvim", -- optional
6+
"ibhagwan/fzf-lua", -- optional
77
"sindrets/diffview.nvim", -- optional
88
},
99
config = true,

‎nvim/lua/plugins/nvim-lspconfig.lua‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,34 @@ return {
66
"saghen/blink.cmp",
77
"williamboman/mason-lspconfig.nvim",
88
},
9-
event = "VeryLazy",
9+
event = { "BufReadPre", "BufNewFile" },
1010

1111
config = function()
1212
-- Prepare completion
1313
local on_attach = function(client, _)
1414
-- Mappings.
15-
vim.keymap.set("n", "<leader><space>c", vim.lsp.buf.declaration, { desc = "Go to declaration" })
15+
vim.keymap.set("n", "<leader><space>c", function()
16+
require("fzf-lua").lsp_declarations({ jump1 = false })
17+
end, { desc = "Show declaration" })
1618
vim.keymap.set("n", "<leader><space>D", function()
17-
require("telescope.builtin").lsp_definitions({ jump_type = "never" })
18-
end, { desc = "Go to definition" })
19+
require("fzf-lua").lsp_definitions({ jump1 = false })
20+
end, { desc = "Show definition" })
1921
vim.keymap.set("n", "<leader><space>h", vim.lsp.buf.hover, { desc = "Show hover" })
20-
vim.keymap.set("n", "<leader><space>i", vim.lsp.buf.implementation, { desc = "Go to implementation" })
22+
vim.keymap.set("n", "<leader><space>i", function()
23+
require("fzf-lua").lsp_implementations({ jump1 = false })
24+
end, { desc = "Show implementation" })
2125
vim.keymap.set("n", "<leader><space>S", vim.lsp.buf.signature_help, { desc = "Show signature help" })
2226
vim.keymap.set("n", "<leader><space>R", vim.lsp.buf.rename, { desc = "Rename" })
2327
vim.keymap.set("n", "<leader><space>r", function()
24-
require("telescope.builtin").lsp_references()
28+
require("fzf-lua").lsp_references()
2529
end, { desc = "Show references" })
2630
vim.keymap.set("n", "<leader><space>d", vim.diagnostic.open_float, { desc = "Show diagnostics" })
27-
vim.keymap.set("n", "<leader><space>i", vim.lsp.buf.code_action, { desc = "Show code actions" })
31+
vim.keymap.set("n", "<leader><space>a", function()
32+
require("fzf-lua").lsp_code_actions()
33+
end, { desc = "Show code actions" })
34+
vim.keymap.set("n", "<leader><space>H", function()
35+
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
36+
end, { desc = "Toggle inlay hints" })
2837

2938
-- Set some keybinds conditional on server capabilities
3039
if client.server_capabilities.document_formatting then
@@ -143,16 +152,6 @@ return {
143152
diagnostics = {
144153
globals = { "vim" },
145154
},
146-
workspace = {
147-
-- Make the server aware of Neovim runtime files
148-
checkThirdParty = false,
149-
library = {
150-
vim.env.VIMRUNTIME,
151-
-- Depending on the usage, you might want to add additional paths here.
152-
"${3rd}/luv/library",
153-
-- "${3rd}/busted/library",
154-
},
155-
},
156155
telemetry = {
157156
enable = false,
158157
},

‎nvim/lua/plugins/safe-ruby.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
return {
22
name = "ruby-safe-path-bootstrap",
33
dir = vim.fn.stdpath("config") .. "/lua/plugins",
4-
lazy = false,
4+
event = { "BufReadPre", "BufNewFile" },
55
priority = 1000,
66
config = function()
77
local ORIGINAL_PATH = vim.env.PATH

‎nvim/lua/plugins/snacks.lua‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,17 @@ return {
99
bigfile = { enabled = true },
1010
image = { enabled = true },
1111
indent = { enabled = false },
12+
notifier = { enabled = true },
1213
quickfile = { enabled = true },
1314
scroll = { enabled = true },
1415
},
16+
keys = {
17+
{
18+
"<leader>fn",
19+
function()
20+
require("snacks").notifier.show_history()
21+
end,
22+
desc = "Notification History",
23+
},
24+
},
1525
}

‎nvim/lua/plugins/telescope.lua‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎nvim/lua/plugins/treesitter-context.lua‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
return {
2+
"nvim-treesitter/nvim-treesitter-context",
3+
dependencies = { "nvim-treesitter/nvim-treesitter" },
4+
event = { "BufReadPost", "BufNewFile" },
5+
config = function()
6+
require("treesitter-context").setup({
7+
enable = true,
8+
max_lines = 0,
9+
min_window_height = 0,
10+
line_numbers = true,
11+
multiline_threshold = 20,
12+
trim_scope = "outer",
13+
mode = "cursor",
14+
separator = nil,
15+
zindex = 20,
16+
on_attach = nil,
17+
})
18+
end,
19+
}

‎nvim/lua/plugins/undotree.lua‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
return {
2+
"jiaoshijie/undotree",
3+
---@module 'undotree.collector'
4+
opts = {
5+
-- your options
6+
},
7+
keys = { -- load the plugin only when using it's keybinding:
8+
{ "<leader>u", "<cmd>lua require('undotree').toggle()<cr>" },
9+
},
10+
}

0 commit comments

Comments
 (0)