Skip to content

Commit f655d4c

Browse files
author
David Ponte
committed
Merge remote-tracking branch 'origin/master'
2 parents 203846f + f4435b7 commit f655d4c

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ If you are experiencing issues, please make sure you have the latest versions.
2323

2424
External Requirements:
2525
- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
26-
- [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
26+
- [ripgrep](https://github.com/BurntSushi/ripgrep#installation),
27+
[fd-find](https://github.com/sharkdp/fd#installation)
2728
- Clipboard tool (xclip/xsel/win32yank or other depending on the platform)
2829
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
2930
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true

init.lua

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
vim.g.mapleader = ' '
44
vim.g.maplocalleader = ' '
55

6+
67
-- Disables netrw for better file explorers
78
vim.g.loaded_netrw = 1
89
vim.g.loaded_netrwPlugin = 1
@@ -77,12 +78,12 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
7778

7879
-- Highlight when yanking (copying) text
7980
-- Try it with `yap` in normal mode
80-
-- See `:help vim.highlight.on_yank()`
81+
-- See `:help vim.hl.on_yank()`
8182
vim.api.nvim_create_autocmd('TextYankPost', {
8283
desc = 'Highlight when yanking (copying) text',
8384
group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
8485
callback = function()
85-
vim.highlight.on_yank()
86+
vim.hl.on_yank()
8687
end,
8788
})
8889

@@ -95,8 +96,11 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
9596
if vim.v.shell_error ~= 0 then
9697
error('Error cloning lazy.nvim:\n' .. out)
9798
end
98-
end ---@diagnostic disable-next-line: undefined-field
99-
vim.opt.rtp:prepend(lazypath)
99+
end
100+
101+
---@type vim.Option
102+
local rtp = vim.opt.rtp
103+
rtp:prepend(lazypath)
100104

101105
-- [[ Configure and install plugins ]]
102106
--
@@ -111,7 +115,7 @@ vim.opt.rtp:prepend(lazypath)
111115
-- NOTE: Here is where you install your plugins.
112116
require('lazy').setup({
113117
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
114-
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
118+
'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
115119

116120
-- NOTE: Plugins can also be added by using a table,
117121
-- with the first argument being the link and the following
@@ -178,7 +182,7 @@ require('lazy').setup({
178182
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
179183
opts = {
180184
-- delay between pressing a key and opening which-key (milliseconds)
181-
-- this setting is independent of vim.opt.timeoutlen
185+
-- this setting is independent of vim.o.timeoutlen
182186
delay = 0,
183187
icons = {
184188
-- set icon mappings to true if you have a Nerd Font
@@ -357,8 +361,8 @@ require('lazy').setup({
357361
-- Automatically install LSPs and related tools to stdpath for Neovim
358362
-- Mason must be loaded before its dependents so we need to set it up here.
359363
-- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
360-
{ 'williamboman/mason.nvim', opts = {} },
361-
'williamboman/mason-lspconfig.nvim',
364+
{ 'mason-org/mason.nvim', opts = {} },
365+
'mason-org/mason-lspconfig.nvim',
362366
'WhoIsSethDaniel/mason-tool-installer.nvim',
363367

364368
-- Useful status updates for LSP.

lua/kickstart/plugins/debug.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ return {
1818
'nvim-neotest/nvim-nio',
1919

2020
-- Installs the debug adapters for you
21-
'williamboman/mason.nvim',
21+
'mason-org/mason.nvim',
2222
'jay-babu/mason-nvim-dap.nvim',
2323

2424
-- Add your own debuggers here

lua/kickstart/plugins/lint.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ return {
5050
-- Only run the linter in buffers that you can modify in order to
5151
-- avoid superfluous noise, notably within the handy LSP pop-ups that
5252
-- describe the hovered symbol using Markdown.
53-
if vim.opt_local.modifiable:get() then
53+
if vim.bo.modifiable then
5454
lint.try_lint()
5555
end
5656
end,

lua/kickstart/plugins/neo-tree.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ return {
99
'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
1010
'MunifTanjim/nui.nvim',
1111
},
12-
cmd = 'Neotree',
12+
lazy = false,
1313
keys = {
1414
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
1515
},

0 commit comments

Comments
 (0)