Skip to content

Commit 0a274ab

Browse files
committed
Merge 'upstream' refactor lazydev, defer clipboard
performance: defer clipboard because xsel and pbcopy can be slow refactor: remove lazydev and luvit-meta as lsp dependencies
2 parents 5a2930f + 84cc123 commit 0a274ab

2 files changed

Lines changed: 20 additions & 16 deletions

File tree

lua/kickstart/plugins/lspconfig.lua

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1+
-- LSP Plugins
12
return {
2-
{ -- LSP Configuration & Plugins
3+
{
4+
-- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
5+
-- used for completion, annotations and signatures of Neovim apis
6+
'folke/lazydev.nvim',
7+
ft = 'lua',
8+
opts = {
9+
library = {
10+
-- Load luvit types when the `vim.uv` word is found
11+
{ path = 'luvit-meta/library', words = { 'vim%.uv' } },
12+
},
13+
},
14+
},
15+
{ 'Bilal2453/luvit-meta', lazy = true },
16+
{
17+
-- Main LSP Configuration
318
'neovim/nvim-lspconfig',
419
dependencies = {
520
-- Automatically install LSPs and related tools to stdpath for Neovim
@@ -10,20 +25,6 @@ return {
1025
-- Useful status updates for LSP.
1126
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
1227
{ 'j-hui/fidget.nvim', opts = {} },
13-
14-
-- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
15-
-- used for completion, annotations and signatures of Neovim apis
16-
{
17-
'folke/lazydev.nvim',
18-
ft = 'lua',
19-
opts = {
20-
library = {
21-
-- Load luvit types when the `vim.uv` word is found
22-
{ path = 'luvit-meta/library', words = { 'vim%.uv' } },
23-
},
24-
},
25-
},
26-
{ 'Bilal2453/luvit-meta', lazy = true },
2728
},
2829
config = function()
2930
-- Brief aside: **What is LSP?**

lua/options.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ vim.opt.mouse = 'a'
1616
vim.opt.showmode = false
1717

1818
-- Sync clipboard between OS and Neovim.
19+
-- Schedule the setting after `UiEnter` because it can increase startup-time.
1920
-- Remove this option if you want your OS clipboard to remain independent.
2021
-- See `:help 'clipboard'`
21-
vim.opt.clipboard = 'unnamedplus'
22+
vim.schedule(function()
23+
vim.opt.clipboard = 'unnamedplus'
24+
end)
2225

2326
-- Enable break indent
2427
vim.opt.breakindent = true

0 commit comments

Comments
 (0)