From db4867acb939b548cf3c60641e1661783551248d Mon Sep 17 00:00:00 2001 From: Tomas Gareau Date: Tue, 7 Jan 2025 09:44:29 -0600 Subject: [PATCH 01/21] fix: prevent mason setup from being run twice (#1298) * fix: prevent mason setup from being run twice Addresses https://github.com/nvim-lua/kickstart.nvim/issues/1297 Currently, we're calling `require('mason').setup(...)` twice: * once when setting it as a dependency of `nvim-lspconfig` (since we set `config = true`) * once in the `config` function we define for `nvim-lspconfig` Calling setup twice can cause issues with, e.g., setting the `PATH` option: you might append Mason's bin dir in one setup call and prepend it in the other. We've kept the setup of `mason` in the `nvim-lspconfig` dependencies table since leaving it to the `config` function caused some plugin-loading-order related issues in the past. See: * https://github.com/nvim-lua/kickstart.nvim/pull/210 * https://github.com/nvim-lua/kickstart.nvim/issues/554 * https://github.com/nvim-lua/kickstart.nvim/pull/555 * https://github.com/nvim-lua/kickstart.nvim/pull/865 * docs: tweak comments per review feedback --- init.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/init.lua b/init.lua index 7758df93a2e..610018e8d99 100644 --- a/init.lua +++ b/init.lua @@ -457,7 +457,9 @@ require('lazy').setup({ 'neovim/nvim-lspconfig', dependencies = { -- Automatically install LSPs and related tools to stdpath for Neovim - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants + -- Mason must be loaded before its dependents so we need to set it up here. + -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` + { 'williamboman/mason.nvim', opts = {} }, 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim', @@ -646,13 +648,16 @@ require('lazy').setup({ } -- Ensure the servers and tools above are installed - -- To check the current status of installed tools and/or manually install - -- other tools, you can run + -- + -- To check the current status of installed tools and/or manually install + -- other tools, you can run -- :Mason -- - -- You can press `g?` for help in this menu. - require('mason').setup() - + -- You can press `g?` for help in this menu. + -- + -- `mason` had to be setup earlier: to configure its options see the + -- `dependencies` table for `nvim-lspconfig` above. + -- -- You can add other tools here that you want Mason to install -- for you, so that they are available from within Neovim. local ensure_installed = vim.tbl_keys(servers or {}) From f6abf682fffba362ff4c6f8157ef72822adda289 Mon Sep 17 00:00:00 2001 From: Nhan Luu <62146587+nhld@users.noreply.github.com> Date: Thu, 16 Jan 2025 02:37:03 +0700 Subject: [PATCH 02/21] chore: remove redundant comment (#1307) --- init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/init.lua b/init.lua index 610018e8d99..edbc37834f2 100644 --- a/init.lua +++ b/init.lua @@ -464,7 +464,6 @@ require('lazy').setup({ 'WhoIsSethDaniel/mason-tool-installer.nvim', -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` { 'j-hui/fidget.nvim', opts = {} }, -- Allows extra capabilities provided by nvim-cmp From ff89769e4583b4f2c170df0d8ccacb950d5dd4e6 Mon Sep 17 00:00:00 2001 From: Nhan Luu <62146587+nhld@users.noreply.github.com> Date: Thu, 16 Jan 2025 02:37:36 +0700 Subject: [PATCH 03/21] chore: fix typo in bug report issue template (#1306) --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 55b45b0d127..86598b8dc98 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,7 +11,7 @@ assignees: '' ## Before Reporting an Issue - I have read the kickstart.nvim README.md. -- I have read the appropiate plugin's documentation. +- I have read the appropriate plugin's documentation. - I have searched that this issue has not been reported before. - [ ] **By checking this, I confirm that the above steps are completed. I understand leaving this unchecked will result in this report being closed immediately.** From 5bdde24dfb353d365d908c5dd700f412ed2ffb17 Mon Sep 17 00:00:00 2001 From: Diorman Colmenares <229201+diorman@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:38:26 -0800 Subject: [PATCH 04/21] Use luals 3rd library for luv (#1303) --- init.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/init.lua b/init.lua index edbc37834f2..4eae8e7d95a 100644 --- a/init.lua +++ b/init.lua @@ -447,11 +447,10 @@ require('lazy').setup({ opts = { library = { -- Load luvit types when the `vim.uv` word is found - { path = 'luvit-meta/library', words = { 'vim%.uv' } }, + { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, }, }, }, - { 'Bilal2453/luvit-meta', lazy = true }, { -- Main LSP Configuration 'neovim/nvim-lspconfig', From e9864eb47f52a5e212116a95688e79f44dfe899e Mon Sep 17 00:00:00 2001 From: AMaugas Date: Tue, 27 Feb 2024 16:14:33 +0100 Subject: [PATCH 05/21] Modifies the treesitter config to make it work on my computers. --- lua/kickstart/plugins/treesitter.lua | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua index b026245adf3..d3fccaa5627 100644 --- a/lua/kickstart/plugins/treesitter.lua +++ b/lua/kickstart/plugins/treesitter.lua @@ -5,7 +5,25 @@ return { main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + ensure_installed = { + 'arduino', + 'asm', + 'bash', + 'c', + 'comment', + 'cpp', + 'diff', + 'html', + 'lua', + 'luadoc', + 'make', + 'markdown', 'markdown_inline', + 'matlab', + 'pascal', + 'python', + 'query', + 'vim', + 'vimdoc' }, -- Autoinstall languages that are not installed auto_install = true, highlight = { From 5614aa2428509393b3baf8d63526532405e1e333 Mon Sep 17 00:00:00 2001 From: AMaugas Date: Tue, 27 Feb 2024 17:05:56 +0100 Subject: [PATCH 06/21] Disables the focus movement keymaps. Signed-off-by: AMaugas --- lua/keymaps.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/keymaps.lua b/lua/keymaps.lua index c07a08a7514..ae72cbf5bc1 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -26,10 +26,10 @@ vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' } -- Use CTRL+ to switch between windows -- -- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` From 81fa9c655fb72e3a0eb9883e0f2229566c97ed2d Mon Sep 17 00:00:00 2001 From: AMaugas Date: Tue, 27 Feb 2024 17:06:31 +0100 Subject: [PATCH 07/21] Adds my prefences for the options. Signed-off-by: AMaugas --- lua/options.lua | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lua/options.lua b/lua/options.lua index 6fb86c6e7ea..206574bf8a1 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -7,7 +7,7 @@ vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' @@ -19,9 +19,7 @@ vim.opt.showmode = false -- Schedule the setting after `UiEnter` because it can increase startup-time. -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` -vim.schedule(function() - vim.opt.clipboard = 'unnamedplus' -end) +vim.opt.clipboard = 'unnamedplus' -- Enable break indent vim.opt.breakindent = true @@ -61,4 +59,18 @@ vim.opt.cursorline = true -- Minimal number of screen lines to keep above and below the cursor. vim.opt.scrolloff = 10 +-- Configures NVim to use Delphi as default pascal language "flavor". +vim.g.pascal_delphi = 1 +vim.g.pascal_one_line_string = 1 +vim.g.pascal_symbol_operator = 1 + +-- Auto-reload buffer when files have been changed outside of NVim +vim.o.autoread = true + +-- Modifies diagnostic appeareance to my liking +vim.diagnostic.config { + severity_sort = true, + virtual_text = false, +} + -- vim: ts=2 sts=2 sw=2 et From 395f14c098f0262f02989780e6ad2ee7b6c44499 Mon Sep 17 00:00:00 2001 From: AMaugas Date: Tue, 27 Feb 2024 17:44:42 +0100 Subject: [PATCH 08/21] Configures Telescope layout to my liking Signed-off-by: AMaugas --- lua/kickstart/plugins/telescope.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lua/kickstart/plugins/telescope.lua b/lua/kickstart/plugins/telescope.lua index 159971f00e7..469021eebf2 100644 --- a/lua/kickstart/plugins/telescope.lua +++ b/lua/kickstart/plugins/telescope.lua @@ -56,11 +56,17 @@ return { -- You can put your default mappings / updates / etc. in here -- All the info you're looking for is in `:help telescope.setup()` -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, + defaults = { + -- mappings = { + -- i = { [''] = 'to_fuzzy_refine' }, + -- }, + layout_config = { + horizontal = { + prompt_position = 'top', + }, + }, + sorting_strategy = 'ascending', + }, -- pickers = {} extensions = { ['ui-select'] = { From f541a7d34a9f40f38ee49bd13c8788de08497be4 Mon Sep 17 00:00:00 2001 From: AMaugas Date: Tue, 27 Feb 2024 17:47:23 +0100 Subject: [PATCH 09/21] Adds additional custom configuration Signed-off-by: AMaugas --- init.lua | 3 ++ lua/custom/delphi.lua | 71 +++++++++++++++++++++++++++++++++++++++++++ lua/custom/init.lua | 1 + 3 files changed, 75 insertions(+) create mode 100644 lua/custom/delphi.lua create mode 100644 lua/custom/init.lua diff --git a/init.lua b/init.lua index 3784c1a18c9..73910e086aa 100644 --- a/init.lua +++ b/init.lua @@ -105,5 +105,8 @@ require 'lazy-bootstrap' -- [[ Configure and install plugins ]] require 'lazy-plugins' +-- [[ Additional personal configurations ]] +require 'custom' + -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/delphi.lua b/lua/custom/delphi.lua new file mode 100644 index 00000000000..57d2fb05322 --- /dev/null +++ b/lua/custom/delphi.lua @@ -0,0 +1,71 @@ +-- Registers the .dpr files as pascal files +vim.filetype.add { + extension = { + dpr = 'pascal', + }, +} + +local lspconfig = require 'lspconfig' +local configs = require 'lspconfig.configs' +local util = require 'lspconfig.util' + +vim.wo.colorcolumn = '120' + +-- Check if the config is already defined (useful when reloading this file) +if not configs.delphi_lsp then + configs.delphi_lsp = { + default_config = { + cmd = { 'C:\\Program Files (x86)\\Embarcadero\\Studio\\23.0\\bin\\DelphiLSP.exe' }, + filetypes = { 'pascal' }, + root_dir = util.root_pattern '*.delphilsp.json', + init_options = { + -- From: https://docwiki.embarcadero.com/RADStudio/Alexandria/en/Using_DelphiLSP_Code_Insight_with_Other_Editors + serverType = 'controller', + agentCount = 2, + returnDccFlags = false, + returnHoverModel = false, + storeProjectSettings = false, + enableFileWatcher = true, + }, + }, + } +end + +local function find_delphi_lsp_settingfile() + local a = util.root_pattern '*.delphilsp.json' + local b = a(util.path.sanitize(vim.loop.cwd())) + if b == nil then + return '' + end + local c = vim.split(vim.fn.glob(b .. '/*'), '\n') + for _, d in pairs(c) do + if string.find(d, 'delphilsp') then + return 'file:///' .. util.path.sanitize(d) + end + end + return '' +end + +lspconfig.delphi_lsp.setup { + settings = { + settingsFile = find_delphi_lsp_settingfile(), + }, + capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()), + on_attach = function(_, bufnr) + local nmap = function(keys, func, desc) + if desc then + desc = 'LSP: ' .. desc + end + vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) + end + + nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') + nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation') + + -- See `:help K` for why this keymap + nmap('K', vim.lsp.buf.hover, 'Hover Documentation') + + -- Lesser used LSP functionality + nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + end, +} diff --git a/lua/custom/init.lua b/lua/custom/init.lua new file mode 100644 index 00000000000..ae9ed134f22 --- /dev/null +++ b/lua/custom/init.lua @@ -0,0 +1 @@ +require 'custom.delphi' From 16a55f5873e8823e6cd39e32c20ec31d9b12a5ce Mon Sep 17 00:00:00 2001 From: AMaugas Date: Tue, 27 Feb 2024 18:08:12 +0100 Subject: [PATCH 10/21] Enables custom plugins sourcing and changes the colorscheme plugin Signed-off-by: AMaugas --- lua/custom/plugins/gruvbox_material.lua | 21 +++++++++++++++++++++ lua/kickstart/plugins/tokyonight.lua | 1 + lua/lazy-plugins.lua | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 lua/custom/plugins/gruvbox_material.lua diff --git a/lua/custom/plugins/gruvbox_material.lua b/lua/custom/plugins/gruvbox_material.lua new file mode 100644 index 00000000000..ba00754edf0 --- /dev/null +++ b/lua/custom/plugins/gruvbox_material.lua @@ -0,0 +1,21 @@ +return { + 'sainnhe/gruvbox-material', + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins + config = function() + if vim.fn.has 'terguicolors' then + vim.opt.termguicolors = true + end + + vim.opt.background = 'dark' + + vim.g.gruvbox_material_background = 'hard' + vim.g.gruvbox_material_better_performance = 1 + + -- Load the colorscheme here + vim.cmd.colorscheme 'gruvbox-material' + + -- You can configure highlights by doing something like + vim.cmd.hi 'Comment gui=none' + end, +} diff --git a/lua/kickstart/plugins/tokyonight.lua b/lua/kickstart/plugins/tokyonight.lua index 3e5e74d945b..2266e837e07 100644 --- a/lua/kickstart/plugins/tokyonight.lua +++ b/lua/kickstart/plugins/tokyonight.lua @@ -5,6 +5,7 @@ return { -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. 'folke/tokyonight.nvim', + enabled = false, priority = 1000, -- Make sure to load this before all the other start plugins. init = function() -- Load the colorscheme here. diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index 9a10fc0e6c5..91645703916 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -63,7 +63,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! From 7623bec50c94ed0146c35e1da595bdf67d4c0c64 Mon Sep 17 00:00:00 2001 From: AMaugas Date: Tue, 27 Feb 2024 18:19:36 +0100 Subject: [PATCH 11/21] Adds highlight commands for diagnostics Signed-off-by: AMaugas --- lua/custom/plugins/gruvbox_material.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lua/custom/plugins/gruvbox_material.lua b/lua/custom/plugins/gruvbox_material.lua index ba00754edf0..84433d5d3be 100644 --- a/lua/custom/plugins/gruvbox_material.lua +++ b/lua/custom/plugins/gruvbox_material.lua @@ -15,7 +15,9 @@ return { -- Load the colorscheme here vim.cmd.colorscheme 'gruvbox-material' - -- You can configure highlights by doing something like - vim.cmd.hi 'Comment gui=none' + local hl_groups = { 'DiagnosticUnderlineError', 'DiagnosticUnderlineWarn', 'DiagnosticUnderlineInfo', 'DiagnosticUnderlineHint'}; + for _, hl in ipairs(hl_groups) do + vim.cmd.highlight(hl .. ' gui=underline'); + end; end, } From 064242ba510b1e3972a3a8cf361c32d25ae19548 Mon Sep 17 00:00:00 2001 From: AMaugas Date: Fri, 19 Apr 2024 10:58:49 +0200 Subject: [PATCH 12/21] Updates DelphiLsp to use current buffer path. Signed-off-by: AMaugas --- lua/custom/delphi.lua | 3 ++- lua/custom/init.lua | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/custom/delphi.lua b/lua/custom/delphi.lua index 57d2fb05322..7f511b0f855 100644 --- a/lua/custom/delphi.lua +++ b/lua/custom/delphi.lua @@ -33,7 +33,8 @@ end local function find_delphi_lsp_settingfile() local a = util.root_pattern '*.delphilsp.json' - local b = a(util.path.sanitize(vim.loop.cwd())) + -- local b = a(util.path.sanitize(vim.loop.cwd())) + local b = a(util.path.sanitize(vim.fn.expand '%:p:h')) if b == nil then return '' end diff --git a/lua/custom/init.lua b/lua/custom/init.lua index ae9ed134f22..491e3728b4f 100644 --- a/lua/custom/init.lua +++ b/lua/custom/init.lua @@ -1 +1,3 @@ +vim.cmd.language 'en_US' + require 'custom.delphi' From 09ccde55739a61bdec7bd8178a0797f72c1b7bc2 Mon Sep 17 00:00:00 2001 From: Bibours Date: Tue, 4 Jun 2024 21:57:05 +0200 Subject: [PATCH 13/21] Adds linebreak config --- lua/custom/init.lua | 3 +-- lua/custom/options.lua | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 lua/custom/options.lua diff --git a/lua/custom/init.lua b/lua/custom/init.lua index 491e3728b4f..759999c0117 100644 --- a/lua/custom/init.lua +++ b/lua/custom/init.lua @@ -1,3 +1,2 @@ -vim.cmd.language 'en_US' - +require 'custom.options' require 'custom.delphi' diff --git a/lua/custom/options.lua b/lua/custom/options.lua new file mode 100644 index 00000000000..6babd2d82b0 --- /dev/null +++ b/lua/custom/options.lua @@ -0,0 +1,4 @@ +-- vim.cmd.language 'en_US' + +vim.wo.linebreak = true +vim.wo.breakindent = true From af185e6d63950060daf3e4cad4471306b798b232 Mon Sep 17 00:00:00 2001 From: Bibours Date: Tue, 4 Jun 2024 21:57:49 +0200 Subject: [PATCH 14/21] Tries to not lauch DelphiLsp when not on Windows --- lua/custom/delphi.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/custom/delphi.lua b/lua/custom/delphi.lua index 7f511b0f855..ab17f3b9be2 100644 --- a/lua/custom/delphi.lua +++ b/lua/custom/delphi.lua @@ -11,6 +11,10 @@ local util = require 'lspconfig.util' vim.wo.colorcolumn = '120' +if vim.loop.os_uname().sysname ~= 'Windows' then + return +end + -- Check if the config is already defined (useful when reloading this file) if not configs.delphi_lsp then configs.delphi_lsp = { From 386ed58f490bd99defaa1174ac019f610761ad87 Mon Sep 17 00:00:00 2001 From: Bibours Date: Mon, 17 Jun 2024 23:26:36 +0200 Subject: [PATCH 15/21] Deactivates neo-tree plugin. Signed-off-by: Bibours --- lua/kickstart/plugins/neo-tree.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index bd4422695aa..13fc1935854 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -3,6 +3,7 @@ return { 'nvim-neo-tree/neo-tree.nvim', + enabled = false, version = '*', dependencies = { 'nvim-lua/plenary.nvim', From 0034644cc57e08857c80f6a239a9a33ce592a0c0 Mon Sep 17 00:00:00 2001 From: Bibours Date: Mon, 17 Jun 2024 23:27:33 +0200 Subject: [PATCH 16/21] Adds vim-fugitive plugin. Signed-off-by: Bibours --- lua/custom/plugins/init.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8d7a..3f03c77b12f 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,8 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { + 'tpope/vim-fugitive', + }, +} From fcbee948dcc8f4157759df0fafe95a677d8c119a Mon Sep 17 00:00:00 2001 From: Bibours Date: Tue, 18 Jun 2024 22:15:47 +0200 Subject: [PATCH 17/21] Adds buffer as source completion. Signed-off-by: Bibours --- lua/kickstart/plugins/cmp.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index e9ed483b75f..2f9d68f5b33 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -34,6 +34,7 @@ return { -- into multiple repos for maintenance purposes. 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path', + 'hrsh7th/cmp-buffer', }, config = function() -- See `:help cmp` @@ -110,6 +111,7 @@ return { { name = 'nvim_lsp' }, { name = 'luasnip' }, { name = 'path' }, + { name = 'buffer' }, }, } end, From 239c6468934fe734d8ca2a41024f521a00e654ae Mon Sep 17 00:00:00 2001 From: Bibours Date: Tue, 18 Jun 2024 22:57:46 +0200 Subject: [PATCH 18/21] Adds lazygit front end plugin. --- lua/custom/plugins/init.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 3f03c77b12f..38dc344c89c 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -6,4 +6,27 @@ return { { 'tpope/vim-fugitive', }, + { + 'kdheepak/lazygit.nvim', + cmd = { + 'LazyGit', + 'LazyGitConfig', + 'LazyGitCurrentFile', + 'LazyGitFilter', + 'LazyGitFilterCurrentFile', + }, + -- optional for floating window border decoration + dependencies = { + 'nvim-telescope/telescope.nvim', + 'nvim-lua/plenary.nvim', + }, + config = function() + require('telescope').load_extension 'lazygit' + end, + -- setting the keybinding for LazyGit with 'keys' is recommended in + -- order to load the plugin when the command is run for the first time + keys = { + { 'lg', 'LazyGit', desc = 'LazyGit' }, + }, + }, } From f0889a55cd9ac10e3a73ec742c9e56a200127056 Mon Sep 17 00:00:00 2001 From: AMaugas Date: Thu, 20 Jun 2024 11:30:17 +0200 Subject: [PATCH 19/21] Corrects the OS detection for delphi LSP. Signed-off-by: AMaugas --- lua/custom/delphi.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/custom/delphi.lua b/lua/custom/delphi.lua index ab17f3b9be2..6bcbeb09655 100644 --- a/lua/custom/delphi.lua +++ b/lua/custom/delphi.lua @@ -11,7 +11,7 @@ local util = require 'lspconfig.util' vim.wo.colorcolumn = '120' -if vim.loop.os_uname().sysname ~= 'Windows' then +if vim.loop.os_uname().sysname ~= 'Windows_NT' then return end From e2a09154532cfb18f44f8f44ea4f750d55fb68bb Mon Sep 17 00:00:00 2001 From: AMaugas Date: Thu, 20 Jun 2024 11:31:17 +0200 Subject: [PATCH 20/21] Minor modifications to personal options. Signed-off-by: AMaugas --- lua/custom/options.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lua/custom/options.lua b/lua/custom/options.lua index 6babd2d82b0..31fbc335c8e 100644 --- a/lua/custom/options.lua +++ b/lua/custom/options.lua @@ -1,4 +1,11 @@ --- vim.cmd.language 'en_US' +if vim.loop.os_uname().sysname == 'Windows_NT' then + vim.cmd.language 'en_US' +end +vim.opt.linebreak = true +vim.o.linebreak = true vim.wo.linebreak = true vim.wo.breakindent = true + +vim.o.tabstop = 2 +vim.o.softtabstop = 2 From 9b30ef7b8bdc27d6574b0f781c27a239cdbfde27 Mon Sep 17 00:00:00 2001 From: BiboursMogz <129614662+BiboursMogz@users.noreply.github.com> Date: Sun, 1 Dec 2024 21:03:52 +0000 Subject: [PATCH 21/21] Upstream update (#3) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * which-key v3 update (#1022) * which-key v3 update * remove unneeded brackets from which-key registration * fix(lazy): added error handling for bootstrap (#1001) * fix: add required parsers from nvim-treesitter * Fix neo-tree keymap description (#932) The lazy.nvim keys parameter does not need the `desc` to be inside a table in the way that vim.keymap.set() does. With this fix the keymap description will be properly shown for example in telescope keymap search * Remove redundant require (#959) * Make debug lazy loadable (#978) * Update README.md | %userprofile%\appdata\local -> %localappdata% (#963) - Replace `%userprofile%\AppData\Local\nvim\` and `$env:USERPROFILE\AppData\Local\nvim` to `%localappdata%\nvim` and `$env:LOCALAPPDATA\nvim respectfully` * Make conform.nvim be lazy-loadable again (#977) The PR that disabled lazy loading (#818) was to fix plugin not being loaded before write. This sets up lazy to load conform before write. * Fix comment about mini.ai example (#985) This example wasn't using `'` so this makes more sense * Neovim 0.10 updates (#936) * Neovim 0.10 updates Provide the buffer for which to enable inlay hints Co-authored-by: Matt Mirus * refactor: replace vim.loop with vim.uv * Upgrade folke/neodev (sunsetting) to folke/lazydev * Update checkhealth for 0.10 release --------- Co-authored-by: Matt Mirus Co-authored-by: mrr11k Co-authored-by: Seb Tomasini * Update lazydev config to fix "Undefined field `fs_stat`" LSP error (#1040) 7513ec8a7dd579957ce2d9b44e05c1da18d7d0e3 switched from neodev to lazydev, but in the process it introduced an LSP error in `init.lua`, which degrades the desired "first timer" experience of kickstart.nvim. This commit follows the configuration suggested in https://github.com/folke/lazydev.nvim/tree/6184ebbbc8045d70077659b7d30c705a588dc62f#-installation which resolves the LSP error. * lint: fix lsp warning in `vim.lsp.inlay_hint.is_enabled` (#947) * fix: lsp warning * review suggestion Co-authored-by: Tom Kuson --------- Co-authored-by: Tom Kuson * Update comment about the toggle inlay hints keymap (#1041) * Remove redundant hlsearch option (#1058) * Modify conform comments to prevent deprecation warning when used (#1057) * refactor: remove lazydev and luvit-meta as lsp dependencies (#1047) * performance: defer clipboard because xsel and pbcopy can be slow (#1049) * Remove treesitter prefer_git option (#1061) - It's not safe and can corrupt other git repos - nvim-treesiter maintainers consider `prefer_git` as deprecated and no longer needed. See nvim-treesitter PR for details: https://github.com/nvim-treesitter/nvim-treesitter/pull/6959 * Add explicit dependency of nvim-lspconfig on cmp-nvim-lsp (#1042) * Update README.md (#1091) * Add note in README about lazy-lock.json (#1090) * Check for loop or uv for lazypath (#1095) * refactor: update treesitter and which-key config (#1068) * Include visual mode in LSP code action keymap (#1060) (#1064) * Enable silent option for default neo-tree plugin keybinding (#1108) * Fix: updated the windows installation commands (#1101) * Update README.md * Update README.md * Fix: updated the windows installation commands * fix: remove deprecated opt for conform.nvim (#1070) - changed lsp_fallback -> lsp_format - updated format_on_save function to reflect change above * cleanup: refactor which-key configuration for cleaner setup (#1102) - Moved `which-key` configuration from inline `config` to `opts` for better organization. - Updated the key mappings setup to use `spec` for defining existing key chains. - Removed deprecated or unnecessary comments and code. This change aligns with updated `which-key` configuration practices, improving readability and maintainability as recommended by @VlaDexa in #1068. * Fix the which-key spec issue caused by recent cleanup (#1113) The recent cleanup accidentally broke the leader key specs because the spec block was in the wrong level of braces. That resulted in which-key no longer showing the description of the key chains such as [S]earch and others. * feat: update references of tsserver to ts_ls (#1131) * fix: update lazy uninstall information link (#1148) * Disable linting autocmd for readonly buffers (#1202) * Disable linting autocmd for readonly buffers This should avoid linting in buffers outside of the user's control, having in mind especially the handy LSP pop-ups that describe your hovered symbol using markdown. Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> * Justify guarding try_lint in readonly buffers Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> --------- Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> * samarth-nagar fix: lazy help tag on line 931 (#1167) * samarth-nagar fix: lazy help tag on line 931 found in issue #1152 * fixed white space --------- Co-authored-by: sam <110125971+samarth-nagar@users.noreply.github.com> * Change diagnostic symbols if vim.g.have_nerd_font is true (#1195) * feat: Change diagnostic symbols if vim.g.have_nerd_font is true * feat: Comment out changes regarding diagnostic symbols so that only those who want to change them can do so --------- Co-authored-by: name * Set breakpoint icons and their highlight colors (#1194) * feat: Set breakpoint icons and their highlight colors * docs: Delete reference URL (written in PR) feat: "Break" and "Stop" arguments of vim.api.nvim_set_hl are changed because they are too common nouns feat: Comment out changes regarding diagnostic symbols so that only those who want to change them can do so --------- Co-authored-by: name * Remove two because there are more than two. (#1213) * feat: Change to prepare for upcoming deprecation of configuring diagnostic-signs using sign_define() (#1232) * Fix nvim-dap not lazy loading (#1216) * Fix nvim-dap not lazy loading The keys property had local variables 'dap' and 'dap-ui' that used `require` and prevented all DAP related plugins from lazy-loading. Fixed this by changing keys to a table and substituting the local variables with a lamba function * Make debug keybind descriptions more consistent * fix: which-key comment typo (#1227) --------- Co-authored-by: Vladislav Grechannik <52157081+VlaDexa@users.noreply.github.com> Co-authored-by: Folke Lemaitre Co-authored-by: Damjan 9000 Co-authored-by: TJ DeVries Co-authored-by: Tom Kuson Co-authored-by: Artyom <84637383+MZhuvka@users.noreply.github.com> Co-authored-by: Richard Macklin <1863540+rmacklin@users.noreply.github.com> Co-authored-by: Matt Mirus Co-authored-by: mrr11k Co-authored-by: Seb Tomasini Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com> Co-authored-by: Arvin Verain Co-authored-by: Brandon Clark Co-authored-by: Ihsan Tonuzi <115842560+iton0@users.noreply.github.com> Co-authored-by: abeldekat <58370433+abeldekat@users.noreply.github.com> Co-authored-by: jstrot <44594069+jstrot@users.noreply.github.com> Co-authored-by: theoboldalex <44616505+theoboldalex@users.noreply.github.com> Co-authored-by: Matt Gallagher <46973220+mattgallagher92@users.noreply.github.com> Co-authored-by: Michael L. Co-authored-by: Bayram Kazik <48856944+bayramkzk@users.noreply.github.com> Co-authored-by: Harshit Pant <97608579+pantharshit007@users.noreply.github.com> Co-authored-by: Nicolás Baquero <88566759+Cheveniko@users.noreply.github.com> Co-authored-by: Bastien Traverse Co-authored-by: Éric NICOLAS Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> Co-authored-by: sam <110125971+samarth-na@users.noreply.github.com> Co-authored-by: sam <110125971+samarth-nagar@users.noreply.github.com> Co-authored-by: gloomy-lemon-debatable <91877885+gloomy-lemon-debatable@users.noreply.github.com> Co-authored-by: Will Winder Co-authored-by: Anjishnu Banerjee <107052359+kaezrr@users.noreply.github.com> Co-authored-by: Miha <79801427+mihasket@users.noreply.github.com> Co-authored-by: mogz --- lua/kickstart/plugins/treesitter.lua | 5 +++-- lua/options.lua | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua index d3fccaa5627..1ba7b9d238f 100644 --- a/lua/kickstart/plugins/treesitter.lua +++ b/lua/kickstart/plugins/treesitter.lua @@ -17,12 +17,13 @@ return { 'lua', 'luadoc', 'make', - 'markdown', 'markdown_inline', + 'markdown', + 'markdown_inline', 'matlab', 'pascal', 'python', 'query', - 'vim', + 'vim', 'vimdoc' }, -- Autoinstall languages that are not installed auto_install = true, diff --git a/lua/options.lua b/lua/options.lua index 206574bf8a1..c557f2529a2 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -19,7 +19,9 @@ vim.opt.showmode = false -- Schedule the setting after `UiEnter` because it can increase startup-time. -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` -vim.opt.clipboard = 'unnamedplus' +vim.schedule(function() + vim.opt.clipboard = 'unnamedplus' +end) -- Enable break indent vim.opt.breakindent = true