Merge branch 'master' into feature/tune
This commit is contained in:
commit
b3adca1d8b
|
@ -25,7 +25,7 @@ Distribution Alternatives:
|
||||||
* Extract the archive to:
|
* Extract the archive to:
|
||||||
`~/.config/nvim` (Linux)
|
`~/.config/nvim` (Linux)
|
||||||
`~/.config/nvim` (MacOS)
|
`~/.config/nvim` (MacOS)
|
||||||
`%userprofile%\AppData\Local\nvim-data\` (Windows)
|
`%userprofile%\AppData\Local\nvim\` (Windows)
|
||||||
* Ensure your extraction method did not extract with a parent folder. For example in ~/.config/nvim you should have init.lua not another folder called kickstart.nvim.
|
* Ensure your extraction method did not extract with a parent folder. For example in ~/.config/nvim you should have init.lua not another folder called kickstart.nvim.
|
||||||
|
|
||||||
### Git Clone Installation
|
### Git Clone Installation
|
||||||
|
@ -40,7 +40,7 @@ Distribution Alternatives:
|
||||||
* **You're ready to go!**
|
* **You're ready to go!**
|
||||||
|
|
||||||
* (Recommended/Optional) Fork this repo (so that you have your own copy that you can modify).
|
* (Recommended/Optional) Fork this repo (so that you have your own copy that you can modify).
|
||||||
* Clone the kickstart repo into `$HOME/.config/nvim/` (Linux/Mac) or `%userprofile%\AppData\Local\nvim-data\` (Windows)
|
* Clone the kickstart repo into `$HOME/.config/nvim/` (Linux/Mac) or `%userprofile%\AppData\Local\nvim\` (Windows)
|
||||||
* If you don't want to include it as a git repo, you can just clone it and then move the files to this location
|
* If you don't want to include it as a git repo, you can just clone it and then move the files to this location
|
||||||
|
|
||||||
Additional system requirements:
|
Additional system requirements:
|
||||||
|
|
6
init.lua
6
init.lua
|
@ -122,8 +122,8 @@ require('lazy').setup({
|
||||||
changedelete = { text = '~' },
|
changedelete = { text = '~' },
|
||||||
},
|
},
|
||||||
on_attach = function(bufnr)
|
on_attach = function(bufnr)
|
||||||
vim.keymap.set('n', '[c', require('gitsigns').prev_hunk, { buffer = bufnr, desc = 'Go to Previous Hunk' })
|
vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
|
||||||
vim.keymap.set('n', ']c', require('gitsigns').next_hunk, { buffer = bufnr, desc = 'Go to Next Hunk' })
|
vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
|
||||||
vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
|
vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
@ -312,7 +312,7 @@ require('nvim-treesitter.configs').setup {
|
||||||
auto_install = false,
|
auto_install = false,
|
||||||
|
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = true, disable = { 'python' } },
|
indent = { enable = true },
|
||||||
incremental_selection = {
|
incremental_selection = {
|
||||||
enable = true,
|
enable = true,
|
||||||
keymaps = {
|
keymaps = {
|
||||||
|
|
Loading…
Reference in New Issue