Skip to content

Commit

Permalink
Some cosmetic ai changes
Browse files Browse the repository at this point in the history
  • Loading branch information
radoslav11 committed Aug 27, 2024
1 parent d14845c commit 7a9618a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
4 changes: 1 addition & 3 deletions init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,11 @@ Plug 'czheo/mojo.vim'

Plug 'christoomey/vim-tmux-navigator'

Plug 'madox2/vim-ai'

" Gromo
Plug 'yetone/avante.nvim'
Plug 'stevearc/dressing.nvim'
Plug 'nvim-lua/plenary.nvim'
Plug 'MunifTanjim/nui.nvim'

call plug#end()

set background=dark
Expand Down Expand Up @@ -316,6 +313,7 @@ autocmd BufNewFile,BufRead * setlocal formatoptions-=cro

" Cursor line
highlight CursorLine cterm=NONE ctermbg=NONE ctermfg=NONE guibg=NONE guifg=NONE
highlight DiffText guibg=#003f66
set cursorline

" Spellcheck
Expand Down
13 changes: 5 additions & 8 deletions lua/init.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
vim.opt.fillchars = { eob = " "}
vim.opt.splitkeep = "screen"
vim.opt.laststatus = 3

require("toggleterm").setup()

Expand Down Expand Up @@ -118,13 +120,11 @@ require("nvim-treesitter.configs").setup({
require("treesitter-context").setup()

require("avante").setup({
---@alias Provider "openai" | "claude" | "azure" | "copilot" | [string]
provider = "copilot",
mappings = {
ask = "<leader>aa",
edit = "<leader>ae",
refresh = "<leader>ar",
--- @class AvanteConflictMappings
-- edit = "<leader>ar",
refresh = "<leader>rr",
diff = {
ours = "co",
theirs = "ct",
Expand All @@ -146,7 +146,7 @@ require("avante").setup({
hint = "<leader>ah",
},
},
hints = { enabled = true },
hints = { enabled = false },
windows = {
wrap = true, -- similar to vim.o.wrap
width = 30, -- default % based on available width
Expand All @@ -156,17 +156,14 @@ require("avante").setup({
},
},
highlights = {
---@type AvanteConflictHighlights
diff = {
current = "DiffText",
incoming = "DiffAdd",
},
},
--- @class AvanteConflictUserConfig
diff = {
debug = false,
autojump = true,
---@type string | fun(): any
list_opener = "copen",
},
})

0 comments on commit 7a9618a

Please sign in to comment.