Compare commits
2 Commits
42b5446064
...
15de473108
Author | SHA1 | Date | |
---|---|---|---|
|
15de473108 | ||
|
adb2caacb8 |
@ -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
21
nvimrc
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user