add copilot

This commit is contained in:
marekmichalski 2024-03-06 10:57:06 +01:00
parent 6fbca010b2
commit df7c677b01
2 changed files with 102 additions and 63 deletions

View File

@ -9,7 +9,7 @@ vim.opt.termguicolors = true
vim.opt.spelllang = 'en_us' vim.opt.spelllang = 'en_us'
vim.opt.spell = true vim.opt.spell = true
require("custom.init") require 'custom.init'
-- [[ Install `lazy.nvim` plugin manager ]] -- [[ Install `lazy.nvim` plugin manager ]]
-- https://github.com/folke/lazy.nvim -- https://github.com/folke/lazy.nvim
-- `:help lazy.nvim.txt` for more info -- `:help lazy.nvim.txt` for more info
@ -54,7 +54,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', opts = {} }, { 'j-hui/fidget.nvim', opts = {} },
-- Additional lua configuration, makes nvim stuff amazing! -- Additional lua configuration, makes nvim stuff amazing!
'folke/neodev.nvim', 'folke/neodev.nvim',
@ -90,7 +90,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',
@ -301,6 +301,8 @@ vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
-- Remap for dealing with word wrap -- Remap for dealing with word wrap
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true }) vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
vim.opt.wrap = true
vim.opt.linebreak = true
-- Diagnostic keymaps -- Diagnostic keymaps
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' }) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
@ -398,8 +400,8 @@ vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc
vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' }) vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' })
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' }) vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
vim.keymap.set("n", "<leader>ps", function() vim.keymap.set('n', '<leader>ps', function()
require('telescope.builtin').grep_string({ search = vim.fn.input("Grep > ") }) require('telescope.builtin').grep_string { search = vim.fn.input 'Grep > ' }
end) end)
-- [[ Configure Treesitter ]] -- [[ Configure Treesitter ]]
-- See `:help nvim-treesitter` -- See `:help nvim-treesitter`
@ -650,5 +652,6 @@ cmp.setup {
}, },
} }
vim.g.copilot_assume_mapped = true
-- The line beneath this is called `modeline`. See `:help modeline` -- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et -- vim: ts=2 sts=2 sw=2 et

View File

@ -1,60 +1,96 @@
return { return {
{ {
'windwp/nvim-autopairs', 'windwp/nvim-autopairs',
event = "InsertEnter", event = 'InsertEnter',
opts = {} opts = {},
}, },
-- { 'github/copilot.vim' }, {
{ 'lewis6991/gitsigns.nvim',
'lewis6991/gitsigns.nvim', config = function()
config = function() require('gitsigns').setup()
require('gitsigns').setup() vim.keymap.set('n', '<leader>gp', ':Gitsigns preview_hunk<CR>', {})
vim.keymap.set('n', '<leader>gp', ':Gitsigns preview_hunk<CR>', {}) vim.keymap.set('n', '<leader>gb', ':Gitsigns toggle_current_line_blame<CR>', {})
vim.keymap.set('n', '<leader>gb', ':Gitsigns toggle_current_line_blame<CR>', {}) end,
end },
}, {
{ 'theprimeagen/harpoon',
"theprimeagen/harpoon", branch = 'harpoon2',
branch = "harpoon2", dependencies = { 'nvim-lua/plenary.nvim' },
dependencies = { "nvim-lua/plenary.nvim" }, config = function()
config = function() require('harpoon'):setup()
require("harpoon"):setup() end,
end, keys = {
keys = { {
{ "<leader>A", function() require("harpoon"):list():append() end, desc = "harpoon file", }, '<leader>A',
{ function()
"<leader>a", require('harpoon'):list():append()
function() end,
local harpoon = require("harpoon") desc = 'harpoon file',
harpoon.ui:toggle_quick_menu(harpoon:list()) },
end, {
desc = "harpoon quick menu", '<leader>a',
}, function()
{ "<leader>1", function() require("harpoon"):list():select(1) end, desc = "harpoon to file 1", }, local harpoon = require 'harpoon'
{ "<leader>2", function() require("harpoon"):list():select(2) end, desc = "harpoon to file 2", }, harpoon.ui:toggle_quick_menu(harpoon:list())
{ "<leader>3", function() require("harpoon"):list():select(3) end, desc = "harpoon to file 3", }, end,
{ "<leader>4", function() require("harpoon"):list():select(4) end, desc = "harpoon to file 4", }, desc = 'harpoon quick menu',
{ "<leader>5", function() require("harpoon"):list():select(5) end, desc = "harpoon to file 5", }, },
}, {
}, '<leader>1',
{ function()
"nvim-tree/nvim-tree.lua", require('harpoon'):list():select(1)
version = "*", end,
lazy = false, desc = 'harpoon to file 1',
dependencies = { },
"nvim-tree/nvim-web-devicons", {
}, '<leader>2',
config = function() function()
require("nvim-tree").setup {} require('harpoon'):list():select(2)
end, end,
keys = { desc = 'harpoon to file 2',
{ '<leader>pv', vim.cmd.NvimTreeToggle, desc = 'Toggle nvim-tree' } },
} {
}, '<leader>3',
{ function()
'mbbill/undotree', require('harpoon'):list():select(3)
keys = { end,
{ '<leader>u', vim.cmd.UndotreeToggle, desc = 'toggle undotree' } desc = 'harpoon to file 3',
} },
}, {
'<leader>4',
function()
require('harpoon'):list():select(4)
end,
desc = 'harpoon to file 4',
},
{
'<leader>5',
function()
require('harpoon'):list():select(5)
end,
desc = 'harpoon to file 5',
},
},
},
{
'nvim-tree/nvim-tree.lua',
version = '*',
lazy = false,
dependencies = {
'nvim-tree/nvim-web-devicons',
},
config = function()
require('nvim-tree').setup {}
end,
keys = {
{ '<leader>pv', vim.cmd.NvimTreeToggle, desc = 'Toggle nvim-tree' },
},
},
{
'mbbill/undotree',
keys = {
{ '<leader>u', vim.cmd.UndotreeToggle, desc = 'toggle undotree' },
},
},
{ 'github/copilot.vim' },
} }