Skip to content

Commit c28edb2

Browse files
committed
latest
1 parent 230929c commit c28edb2

20 files changed

+355
-286
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ nvim
55

66
spell/
77
lazy-lock.json
8+
.DS_Store

.stylua.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ indent_type = "Spaces"
44
indent_width = 2
55
quote_style = "AutoPreferSingle"
66
call_parentheses = "None"
7+
collapse_simple_statement = "Always"

README.md

Lines changed: 83 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@ A starting point for Neovim that is:
1919
Kickstart.nvim targets *only* the latest
2020
['stable'](https://github.com/neovim/neovim/releases/tag/stable) and latest
2121
['nightly'](https://github.com/neovim/neovim/releases/tag/nightly) of Neovim.
22-
If you are experiencing issues, please make sure you have the latest versions.
22+
If you are experiencing issues, please make sure you have at least the latest
23+
stable version. Most likely, you want to install neovim via a [package
24+
manager](https://github.com/neovim/neovim/blob/master/INSTALL.md#install-from-package).
25+
To check your neovim version, run `nvim --version` and make sure it is not
26+
below the latest
27+
['stable'](https://github.com/neovim/neovim/releases/tag/stable) version. If
28+
your chosen install method only gives you an outdated version of neovim, find
29+
alternative [installation methods below](#alternative-neovim-installation-methods).
2330

2431
### Install External Dependencies
2532

@@ -159,7 +166,7 @@ examples of adding popularly requested plugins.
159166
160167
Below you can find OS specific install instructions for Neovim and dependencies.
161168
162-
After installing all the dependencies continue with the [Install Kickstart](#Install-Kickstart) step.
169+
After installing all the dependencies continue with the [Install Kickstart](#install-kickstart) step.
163170
164171
#### Windows Installation
165172
@@ -244,3 +251,77 @@ sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim
244251
```
245252
</details>
246253

254+
### Alternative neovim installation methods
255+
256+
For some systems it is not unexpected that the [package manager installation
257+
method](https://github.com/neovim/neovim/blob/master/INSTALL.md#install-from-package)
258+
recommended by neovim is significantly behind. If that is the case for you,
259+
pick one of the following methods that are known to deliver fresh neovim versions very quickly.
260+
They have been picked for their popularity and because they make installing and updating
261+
neovim to the latest versions easy. You can also find more detail about the
262+
available methods being discussed
263+
[here](https://github.com/nvim-lua/kickstart.nvim/issues/1583).
264+
265+
266+
<details><summary>Bob</summary>
267+
268+
[Bob](https://github.com/MordechaiHadad/bob) is a Neovim version manager for
269+
all plattforms. Simply install
270+
[rustup](https://rust-lang.github.io/rustup/installation/other.html),
271+
and run the following commands:
272+
273+
```bash
274+
rustup default stable
275+
rustup update stable
276+
cargo install bob-nvim
277+
bob use stable
278+
```
279+
280+
</details>
281+
282+
<details><summary>Homebrew</summary>
283+
284+
[Homebrew](https://brew.sh) is a package manager popular on Mac and Linux.
285+
Simply install using [`brew install`](https://formulae.brew.sh/formula/neovim).
286+
287+
</details>
288+
289+
<details><summary>Flatpak</summary>
290+
291+
Flatpak is a package manager for applications that allows developers to package their applications
292+
just once to make it available on all Linux systems. Simply [install flatpak](https://flatpak.org/setup/)
293+
and setup [flathub](https://flathub.org/setup) to [install neovim](https://flathub.org/apps/io.neovim.nvim).
294+
295+
</details>
296+
297+
<details><summary>asdf and mise-en-place</summary>
298+
299+
[asdf](https://asdf-vm.com/) and [mise](https://mise.jdx.dev/) are tool version managers,
300+
mostly aimed towards project-specific tool versioning. However both support managing tools
301+
globally in the user-space as well:
302+
303+
<details><summary>mise</summary>
304+
305+
[Install mise](https://mise.jdx.dev/getting-started.html), then run:
306+
307+
```bash
308+
mise plugins install neovim
309+
mise use neovim@stable
310+
```
311+
312+
</details>
313+
314+
<details><summary>asdf</summary>
315+
316+
[Install asdf](https://asdf-vm.com/guide/getting-started.html), then run:
317+
318+
```bash
319+
asdf plugin add neovim
320+
asdf install neovim stable
321+
asdf set neovim stable --home
322+
asdf reshim neovim
323+
```
324+
325+
</details>
326+
327+
</details>

lua/custom/plugins/init.lua

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
vim.g.netrw_banner = 0 -- disable topbar
2-
-- vim.g.netrw_browse_split = 4 -- open in prior buffer/window
3-
-- -- vim.g.netrw_altv = 1 -- open fle splits to the right
42
vim.g.netrw_liststyle = 3 -- tree view
5-
-- vim.g.netrw_winsize = 25 -- length of the window
63
vim.diagnostic.config {
74
virtual_text = {
8-
-- source = "always", -- Or "if_many"
95
prefix = '', -- Could be '■', '▎', 'x'
106
},
117
severity_sort = true,
@@ -25,14 +21,12 @@ vim.keymap.set('n', '<leader>yb', '<cmd>let @+ = expand("%")<CR>', { desc = 'yan
2521
vim.opt.completeopt = { 'menuone', 'fuzzy', 'noinsert', 'preview' }
2622
vim.o.omnifunc = 'v:lua.vim.lsp.omnifunc'
2723

28-
-- vim.diagnostic.config {
29-
-- virtual_text = false,
30-
-- }
3124
-- never use tabs
3225
vim.o.expandtab = true
26+
-- evitar folds
27+
vim.o.foldlevelstart = 99
3328

3429
local set = vim.opt_local
3530
set.shiftwidth = 2
3631
vim.o.shiftwidth = 2
37-
vim.keymap.set('n', '<leader>yb', '<cmd>let @+ = expand("%")<CR>', { desc = 'yank to plus register current relative path' })
3832
return {}

lua/keymaps.lua

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,29 @@
55
-- See `:help hlsearch`
66
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
77

8-
-- Diagnostic keymaps
8+
-- Diagnostic Config & Keymaps
9+
-- See :help vim.diagnostic.Opts
10+
vim.diagnostic.config {
11+
update_in_insert = false,
12+
severity_sort = true,
13+
float = {
14+
border = 'rounded',
15+
source = 'if_many',
16+
format = function(diagnostic)
17+
-- Incluye el mensaje y el origen (LSP)
18+
return string.format('%s [%s]', diagnostic.message, diagnostic.source or 'unknown')
19+
end,
20+
},
21+
underline = { severity = vim.diagnostic.severity.ERROR },
22+
23+
-- Can switch between these as you prefer
24+
virtual_text = true, -- Text shows up at the end of the line
25+
virtual_lines = false, -- Teest shows up underneath the line, with virtual lines
26+
27+
-- Auto open the float, so you can easily read the errors when jumping with `[d` and `]d`
28+
jump = { float = true },
29+
}
30+
931
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
1032

1133
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
@@ -46,9 +68,7 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
4668
vim.api.nvim_create_autocmd('TextYankPost', {
4769
desc = 'Highlight when yanking (copying) text',
4870
group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
49-
callback = function()
50-
vim.hl.on_yank()
51-
end,
71+
callback = function() vim.hl.on_yank() end,
5272
})
5373

5474
-- vim: ts=2 sts=2 sw=2 et

lua/kickstart/health.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local check_version = function()
1212
return
1313
end
1414

15-
if vim.version.ge(vim.version(), '0.10-dev') then
15+
if vim.version.ge(vim.version(), '0.11') then
1616
vim.health.ok(string.format("Neovim version is: '%s'", verstr))
1717
else
1818
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))

lua/kickstart/plugins/blink-cmp.lua

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ return {
99
'L3MON4D3/LuaSnip',
1010
version = '2.*',
1111
build = (function()
12-
if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
13-
return
14-
end
12+
if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then return end
1513
return 'make install_jsregexp'
1614
end)(),
1715
dependencies = {},
1816
opts = {},
1917
},
20-
'folke/lazydev.nvim',
2118

2219
-- Copilot backend (Lua) -- disable inline/panel; we'll use Blink only
2320
{
@@ -44,10 +41,8 @@ return {
4441

4542
sources = {
4643
-- add "copilot" to the default sources
47-
default = { 'lsp', 'path', 'snippets', 'lazydev', 'copilot' },
44+
default = { 'lsp', 'path', 'snippets', 'copilot' },
4845
providers = {
49-
lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
50-
5146
-- define the Copilot provider for Blink
5247
copilot = {
5348
name = 'copilot',
@@ -67,7 +62,6 @@ return {
6762
},
6863
},
6964
},
70-
7165
snippets = { preset = 'luasnip' },
7266
fuzzy = { implementation = 'lua' },
7367
signature = { enabled = true },

lua/kickstart/plugins/conform.lua

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ return {
66
keys = {
77
{
88
'<leader>f',
9-
function()
10-
require('conform').format { async = true, lsp_format = 'fallback' }
11-
end,
9+
function() require('conform').format { async = true, lsp_format = 'fallback' } end,
1210
mode = '',
1311
desc = '[F]ormat buffer',
1412
},

lua/kickstart/plugins/debug.lua

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,52 +28,38 @@ return {
2828
-- Basic debugging keymaps, feel free to change to your liking!
2929
{
3030
'<F5>',
31-
function()
32-
require('dap').continue()
33-
end,
31+
function() require('dap').continue() end,
3432
desc = 'Debug: Start/Continue',
3533
},
3634
{
3735
'<F1>',
38-
function()
39-
require('dap').step_into()
40-
end,
36+
function() require('dap').step_into() end,
4137
desc = 'Debug: Step Into',
4238
},
4339
{
4440
'<F2>',
45-
function()
46-
require('dap').step_over()
47-
end,
41+
function() require('dap').step_over() end,
4842
desc = 'Debug: Step Over',
4943
},
5044
{
5145
'<F3>',
52-
function()
53-
require('dap').step_out()
54-
end,
46+
function() require('dap').step_out() end,
5547
desc = 'Debug: Step Out',
5648
},
5749
{
5850
'<leader>b',
59-
function()
60-
require('dap').toggle_breakpoint()
61-
end,
51+
function() require('dap').toggle_breakpoint() end,
6252
desc = 'Debug: Toggle Breakpoint',
6353
},
6454
{
6555
'<leader>B',
66-
function()
67-
require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ')
68-
end,
56+
function() require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') end,
6957
desc = 'Debug: Set Breakpoint',
7058
},
7159
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
7260
{
7361
'<F7>',
74-
function()
75-
require('dapui').toggle()
76-
end,
62+
function() require('dapui').toggle() end,
7763
desc = 'Debug: See last session result.',
7864
},
7965
},

lua/kickstart/plugins/gitsigns.lua

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,8 @@ return {
5353

5454
-- Actions
5555
-- visual mode
56-
map('v', '<leader>hs', function()
57-
gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
58-
end, { desc = 'git [s]tage hunk' })
59-
map('v', '<leader>hr', function()
60-
gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
61-
end, { desc = 'git [r]eset hunk' })
56+
map('v', '<leader>hs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' })
57+
map('v', '<leader>hr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' })
6258
-- normal mode
6359
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
6460
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
@@ -68,9 +64,7 @@ return {
6864
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
6965
map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
7066
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
71-
map('n', '<leader>hD', function()
72-
gitsigns.diffthis '@'
73-
end, { desc = 'git [D]iff against last commit' })
67+
map('n', '<leader>hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' })
7468
-- Toggles
7569
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
7670
map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })

0 commit comments

Comments
 (0)