From 7e3c5f1a73e714c05a7a11e90e103487e257041f Mon Sep 17 00:00:00 2001
From: Mahesh Asolkar <mahesh@mahesha.com>
Date: Sun, 27 Aug 2023 11:39:03 -0700
Subject: [PATCH] Conflict resolution

---
 nvim.init.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nvim.init.lua b/nvim.init.lua
index 724a1b2..96731d6 100644
--- a/nvim.init.lua
+++ b/nvim.init.lua
@@ -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