Compare commits

..

No commits in common. "15de4731087560a6a7d5c341fc403b51468764e2" and "42b5446064fe4bea94bdf45c42b3f00c43ca9374" have entirely different histories.

2 changed files with 0 additions and 23 deletions

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

21
nvimrc

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