updates
This commit is contained in:
parent
3dee17e949
commit
154a3c5356
|
@ -81,13 +81,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
|
||||||
If you're using `cmd.exe`:
|
If you're using `cmd.exe`:
|
||||||
|
|
||||||
```
|
```
|
||||||
git clone https://github.com/nvim-lua/kickstart.nvim.git %localappdata%\nvim\
|
git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
|
||||||
```
|
```
|
||||||
|
|
||||||
If you're using `powershell.exe`
|
If you're using `powershell.exe`
|
||||||
|
|
||||||
```
|
```
|
||||||
git clone https://github.com/nvim-lua/kickstart.nvim.git $env:LOCALAPPDATA\nvim\
|
git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
|
||||||
```
|
```
|
||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
101
init.lua
101
init.lua
|
@ -303,60 +303,58 @@ require('lazy').setup({
|
||||||
{ -- Useful plugin to show you pending keybinds.
|
{ -- Useful plugin to show you pending keybinds.
|
||||||
'folke/which-key.nvim',
|
'folke/which-key.nvim',
|
||||||
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
|
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
|
||||||
config = function() -- This is the function that runs, AFTER loading
|
opts = {
|
||||||
require('which-key').setup {
|
icons = {
|
||||||
icons = {
|
-- set icon mappings to true if you have a Nerd Font
|
||||||
-- set icon mappings to true if you have a Nerd Font
|
mappings = vim.g.have_nerd_font,
|
||||||
mappings = vim.g.have_nerd_font,
|
-- If you are using a Nerd Font: set icons.keys to an empty table which will use the
|
||||||
-- If you are using a Nerd Font: set icons.keys to an empty table which will use the
|
-- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
|
||||||
-- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
|
keys = vim.g.have_nerd_font and {} or {
|
||||||
keys = vim.g.have_nerd_font and {} or {
|
Up = '<Up> ',
|
||||||
Up = '<Up> ',
|
Down = '<Down> ',
|
||||||
Down = '<Down> ',
|
Left = '<Left> ',
|
||||||
Left = '<Left> ',
|
Right = '<Right> ',
|
||||||
Right = '<Right> ',
|
C = '<C-…> ',
|
||||||
C = '<C-…> ',
|
M = '<M-…> ',
|
||||||
M = '<M-…> ',
|
D = '<D-…> ',
|
||||||
D = '<D-…> ',
|
S = '<S-…> ',
|
||||||
S = '<S-…> ',
|
CR = '<CR> ',
|
||||||
CR = '<CR> ',
|
Esc = '<Esc> ',
|
||||||
Esc = '<Esc> ',
|
ScrollWheelDown = '<ScrollWheelDown> ',
|
||||||
ScrollWheelDown = '<ScrollWheelDown> ',
|
ScrollWheelUp = '<ScrollWheelUp> ',
|
||||||
ScrollWheelUp = '<ScrollWheelUp> ',
|
NL = '<NL> ',
|
||||||
NL = '<NL> ',
|
BS = '<BS> ',
|
||||||
BS = '<BS> ',
|
Space = '<Space> ',
|
||||||
Space = '<Space> ',
|
Tab = '<Tab> ',
|
||||||
Tab = '<Tab> ',
|
F1 = '<F1>',
|
||||||
F1 = '<F1>',
|
F2 = '<F2>',
|
||||||
F2 = '<F2>',
|
F3 = '<F3>',
|
||||||
F3 = '<F3>',
|
F4 = '<F4>',
|
||||||
F4 = '<F4>',
|
F5 = '<F5>',
|
||||||
F5 = '<F5>',
|
F6 = '<F6>',
|
||||||
F6 = '<F6>',
|
F7 = '<F7>',
|
||||||
F7 = '<F7>',
|
F8 = '<F8>',
|
||||||
F8 = '<F8>',
|
F9 = '<F9>',
|
||||||
F9 = '<F9>',
|
F10 = '<F10>',
|
||||||
F10 = '<F10>',
|
F11 = '<F11>',
|
||||||
F11 = '<F11>',
|
F12 = '<F12>',
|
||||||
F12 = '<F12>',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
|
|
||||||
-- Document existing key chains
|
-- Document existing key chains
|
||||||
require('which-key').add {
|
spec = {
|
||||||
{ '<leader>q', '<cmd>confirm q<cr>', desc = 'Quit', mode = 'n' },
|
{ '<leader>q', '<cmd>confirm q<cr>', desc = 'Quit', mode = 'n' },
|
||||||
{ '<leader>w', '<cmd>w!<cr>', desc = 'Write', mode = 'n' },
|
{ '<leader>w', '<cmd>w!<cr>', desc = 'Write', mode = 'n' },
|
||||||
{ '<leader>c', group = '[C]ode' },
|
{ '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
|
||||||
{ '<leader>d', group = '[D]ocument' },
|
{ '<leader>d', group = '[D]ocument' },
|
||||||
{ '<leader>r', group = '[R]ename' },
|
{ '<leader>r', group = '[R]ename' },
|
||||||
{ '<leader>s', group = '[S]earch' },
|
{ '<leader>s', group = '[S]earch' },
|
||||||
{ '<leader>i', group = '[I]nformation' },
|
{ '<leader>i', group = '[I]nformation' },
|
||||||
{ '<leader>t', group = '[T]oggle' },
|
{ '<leader>t', group = '[T]oggle' },
|
||||||
{ '<leader>h', group = 'Git [H]unk' },
|
|
||||||
{ '<leader>tt', '<cmd>set relativenumber!<CR>', desc = 'Toggle Relative Number', mode = 'n' },
|
{ '<leader>tt', '<cmd>set relativenumber!<CR>', desc = 'Toggle Relative Number', mode = 'n' },
|
||||||
}
|
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
|
||||||
end,
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- NOTE: Plugins can specify dependencies.
|
-- NOTE: Plugins can specify dependencies.
|
||||||
|
@ -540,8 +538,9 @@ require('lazy').setup({
|
||||||
--
|
--
|
||||||
-- In this case, we create a function that lets us more easily define mappings specific
|
-- In this case, we create a function that lets us more easily define mappings specific
|
||||||
-- for LSP related items. It sets the mode, buffer and description for us each time.
|
-- for LSP related items. It sets the mode, buffer and description for us each time.
|
||||||
local map = function(keys, func, desc)
|
local map = function(keys, func, desc, mode)
|
||||||
vim.keymap.set('n', keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
|
mode = mode or 'n'
|
||||||
|
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Jump to the definition of the word under your cursor.
|
-- Jump to the definition of the word under your cursor.
|
||||||
|
@ -575,7 +574,7 @@ require('lazy').setup({
|
||||||
|
|
||||||
-- Execute a code action, usually your cursor needs to be on top of an error
|
-- Execute a code action, usually your cursor needs to be on top of an error
|
||||||
-- or a suggestion from your LSP for this to activate.
|
-- or a suggestion from your LSP for this to activate.
|
||||||
map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
|
map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
|
||||||
|
|
||||||
-- WARN: This is not Goto Definition, this is Goto Declaration.
|
-- WARN: This is not Goto Definition, this is Goto Declaration.
|
||||||
-- For example, in C this would take you to the header.
|
-- For example, in C this would take you to the header.
|
||||||
|
@ -756,7 +755,7 @@ require('lazy').setup({
|
||||||
{
|
{
|
||||||
'<leader>cf',
|
'<leader>cf',
|
||||||
function()
|
function()
|
||||||
require('conform').format { async = true, lsp_fallback = true }
|
require('conform').format { async = true, lsp_format = 'fallback' }
|
||||||
end,
|
end,
|
||||||
mode = '',
|
mode = '',
|
||||||
desc = '[F]ormat buffer',
|
desc = '[F]ormat buffer',
|
||||||
|
@ -769,9 +768,15 @@ require('lazy').setup({
|
||||||
-- have a well standardized coding style. You can add additional
|
-- have a well standardized coding style. You can add additional
|
||||||
-- languages here or re-enable it for the disabled ones.
|
-- languages here or re-enable it for the disabled ones.
|
||||||
-- local disable_filetypes = { c = true, cpp = true }
|
-- local disable_filetypes = { c = true, cpp = true }
|
||||||
|
local lsp_format_opt
|
||||||
|
if disable_filetypes[vim.bo[bufnr].filetype] then
|
||||||
|
lsp_format_opt = 'never'
|
||||||
|
else
|
||||||
|
lsp_format_opt = 'fallback'
|
||||||
|
end
|
||||||
return {
|
return {
|
||||||
timeout_ms = 500,
|
timeout_ms = 500,
|
||||||
-- lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
|
lsp_format = lsp_format_opt,
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
formatters_by_ft = {
|
formatters_by_ft = {
|
||||||
|
|
|
@ -11,7 +11,7 @@ return {
|
||||||
},
|
},
|
||||||
cmd = 'Neotree',
|
cmd = 'Neotree',
|
||||||
keys = {
|
keys = {
|
||||||
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal' },
|
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
|
||||||
},
|
},
|
||||||
opts = {
|
opts = {
|
||||||
filesystem = {
|
filesystem = {
|
||||||
|
|
Loading…
Reference in New Issue