Conflict resolution
This commit is contained in:
parent
48cce9e0c4
commit
7e3c5f1a73
@ -94,7 +94,6 @@ require('packer').startup(function(use)
|
|||||||
'williamboman/mason-lspconfig.nvim',
|
'williamboman/mason-lspconfig.nvim',
|
||||||
|
|
||||||
-- Useful status updates for LSP
|
-- Useful status updates for LSP
|
||||||
{'j-hui/fidget.nvim', branch = 'legacy'},
|
|
||||||
use {
|
use {
|
||||||
'j-hui/fidget.nvim',
|
'j-hui/fidget.nvim',
|
||||||
tag = 'legacy',
|
tag = 'legacy',
|
||||||
@ -177,7 +176,8 @@ vim.api.nvim_create_autocmd('BufWritePost', {
|
|||||||
-- See `:help vim.o`
|
-- See `:help vim.o`
|
||||||
|
|
||||||
if vim.g.neovide then
|
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
|
end
|
||||||
|
|
||||||
-- Set highlight on search
|
-- Set highlight on search
|
||||||
|
Loading…
Reference in New Issue
Block a user