Conflict resolution

This commit is contained in:
Mahesh Asolkar 2023-08-27 11:39:03 -07:00
parent 48cce9e0c4
commit 7e3c5f1a73
1 changed files with 9 additions and 9 deletions

View File

@ -94,15 +94,14 @@ require('packer').startup(function(use)
'williamboman/mason-lspconfig.nvim',
-- Useful status updates for LSP
{'j-hui/fidget.nvim', branch = 'legacy'},
use {
'j-hui/fidget.nvim',
tag = 'legacy',
config = function()
require("fidget").setup {
-- options
}
end,
'j-hui/fidget.nvim',
tag = 'legacy',
config = function()
require("fidget").setup {
-- options
}
end,
}
},
}
@ -177,7 +176,8 @@ vim.api.nvim_create_autocmd('BufWritePost', {
-- See `:help vim.o`
if vim.g.neovide then
vim.o.guifont = "Iosevka Term:h16"
vim.o.guifont = "Iosevka Term:h12"
vim.g.neovide_scale_factor = 1.0
end
-- Set highlight on search