Compare commits

...

2 Commits

Author SHA1 Message Date
Rob Watson
15de473108 feat(nvim): add copilot config 2023-09-17 07:33:57 +02:00
Rob Watson
adb2caacb8 feat(git): add aliases 2023-09-17 07:33:57 +02:00
2 changed files with 23 additions and 0 deletions

View File

@ -43,7 +43,9 @@
lp = log -p lp = log -p
lm = logme lm = logme
logme = !sh -c 'git log --author=\"$(git config --get user.name)\"' logme = !sh -c 'git log --author=\"$(git config --get user.name)\"'
lrb = !git log $(git drb)
ls = !git branch --format '%(refname:short)' | fzf ls = !git branch --format '%(refname:short)' | fzf
ma = merge --abort
mainbranch = !gitmainbranch mainbranch = !gitmainbranch
mls = !git merge $(git ls) mls = !git merge $(git ls)
mr = !git merge $(git rb) mr = !git merge $(git rb)

21
nvimrc
View File

@ -639,9 +639,27 @@ require'treesitter-context'.setup{
} }
EOF EOF
" copilot:
packadd! copilot.lua " https://github.com/zbirenbaum/copilot.lua.git
lua <<EOF
vim.defer_fn(function()
require('copilot').setup({
panel = {
enabled = false,
},
suggestion = {
enabled = false,
},
})
end, 100)
EOF
" nvim-cmp: " nvim-cmp:
packadd! nvim-cmp " https://github.com/hrsh7th/nvim-cmp.git packadd! nvim-cmp " https://github.com/hrsh7th/nvim-cmp.git
packadd! copilot-cmp " https://github.com/zbirenbaum/copilot-cmp.git
packadd! vim-vsnip " https://github.com/hrsh7th/vim-vsnip.git packadd! vim-vsnip " https://github.com/hrsh7th/vim-vsnip.git
packadd! cmp-vsnip " https://github.com/hrsh7th/cmp-vsnip.git packadd! cmp-vsnip " https://github.com/hrsh7th/cmp-vsnip.git
packadd! cmp-nvim-lsp " https://github.com/hrsh7th/cmp-nvim-lsp.git packadd! cmp-nvim-lsp " https://github.com/hrsh7th/cmp-nvim-lsp.git
@ -672,6 +690,7 @@ lua <<EOF
}, },
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'copilot' },
{ {
name = 'buffer', name = 'buffer',
option = { option = {
@ -740,6 +759,8 @@ local on_attach = function(client, bufnr)
require 'lsp_signature'.on_attach({ require 'lsp_signature'.on_attach({
hint_enable = false, hint_enable = false,
}) })
require 'copilot_cmp'.setup();
end end
-- Go -- Go