|
|
@ -3,8 +3,6 @@
|
|
|
|
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
|
|
|
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
|
|
|
vim.g.mapleader = ' '
|
|
|
|
vim.g.mapleader = ' '
|
|
|
|
vim.g.maplocalleader = ' '
|
|
|
|
vim.g.maplocalleader = ' '
|
|
|
|
vim.g.loaded_netrw = 1
|
|
|
|
|
|
|
|
vim.g.loaded_netrwPlugin = 1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- Install package manager
|
|
|
|
-- Install package manager
|
|
|
|
-- https://github.com/folke/lazy.nvim
|
|
|
|
-- https://github.com/folke/lazy.nvim
|
|
|
@ -49,7 +47,7 @@ require('lazy').setup({
|
|
|
|
|
|
|
|
|
|
|
|
-- Useful status updates for LSP
|
|
|
|
-- Useful status updates for LSP
|
|
|
|
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
|
|
|
|
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
|
|
|
|
{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
|
|
|
|
{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
|
|
|
|
|
|
|
|
|
|
|
|
-- Additional lua configuration, makes nvim stuff amazing!
|
|
|
|
-- Additional lua configuration, makes nvim stuff amazing!
|
|
|
|
'folke/neodev.nvim',
|
|
|
|
'folke/neodev.nvim',
|
|
|
@ -73,7 +71,7 @@ require('lazy').setup({
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
-- Useful plugin to show you pending keybinds.
|
|
|
|
-- Useful plugin to show you pending keybinds.
|
|
|
|
{ 'folke/which-key.nvim', opts = {} },
|
|
|
|
{ 'folke/which-key.nvim', opts = {} },
|
|
|
|
{
|
|
|
|
{
|
|
|
|
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
|
|
|
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
|
|
|
'lewis6991/gitsigns.nvim',
|
|
|
|
'lewis6991/gitsigns.nvim',
|
|
|
@ -87,7 +85,8 @@ require('lazy').setup({
|
|
|
|
changedelete = { text = '~' },
|
|
|
|
changedelete = { text = '~' },
|
|
|
|
},
|
|
|
|
},
|
|
|
|
on_attach = function(bufnr)
|
|
|
|
on_attach = function(bufnr)
|
|
|
|
vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
|
|
|
|
vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk,
|
|
|
|
|
|
|
|
{ buffer = bufnr, desc = '[G]o to [P]revious 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>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,
|
|
|
@ -164,10 +163,10 @@ require('lazy').setup({
|
|
|
|
-- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
|
|
|
|
-- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
|
|
|
|
-- These are some example plugins that I've included in the kickstart repository.
|
|
|
|
-- These are some example plugins that I've included in the kickstart repository.
|
|
|
|
-- Uncomment any of the lines below to enable them.
|
|
|
|
-- Uncomment any of the lines below to enable them.
|
|
|
|
require 'lornest.plugins.fugitive',
|
|
|
|
require 'lornest.plugins.fugitive',
|
|
|
|
require 'lornest.plugins.harpoon',
|
|
|
|
require 'lornest.plugins.harpoon',
|
|
|
|
require 'lornest.plugins.copilot',
|
|
|
|
require 'lornest.plugins.copilot',
|
|
|
|
require 'lornest.plugins.nvim-tree',
|
|
|
|
require 'lornest.plugins.nvim-tree',
|
|
|
|
-- require 'kickstart.plugins.autoformat',
|
|
|
|
-- require 'kickstart.plugins.autoformat',
|
|
|
|
-- require 'kickstart.plugins.debug',
|
|
|
|
-- require 'kickstart.plugins.debug',
|
|
|
|
|
|
|
|
|
|
|
@ -404,7 +403,7 @@ end
|
|
|
|
-- define the property 'filetypes' to the map in question.
|
|
|
|
-- define the property 'filetypes' to the map in question.
|
|
|
|
local servers = {
|
|
|
|
local servers = {
|
|
|
|
-- clangd = {},
|
|
|
|
-- clangd = {},
|
|
|
|
-- gopls = {},
|
|
|
|
gopls = {},
|
|
|
|
-- pyright = {},
|
|
|
|
-- pyright = {},
|
|
|
|
-- rust_analyzer = {},
|
|
|
|
-- rust_analyzer = {},
|
|
|
|
-- tsserver = {},
|
|
|
|
-- tsserver = {},
|
|
|
|