fixed neovim cursor disappearance during sustained motions

- synchronous git calls -> async. in statusline
- cached git branch in statusline

11 files changed, 75 insertions, 38 deletions

diff --git a/nvim/lua/core/statusline.lua b/nvim/lua/core/statusline.lua
index 45a2c42..cc4bd09 100644
--- a/nvim/lua/core/statusline.lua
+++ b/nvim/lua/core/statusline.lua
@@ -1,48 +1,75 @@
 local M = {}
 
-local function git_branch()
-	local git_dir = vim.fn.system("git rev-parse --git-dir 2>/dev/null")
-	if vim.v.shell_error ~= 0 then
-		return ""
-	end
-	local branch = vim.fn.system("git branch --show-current 2>/dev/null | tr -d '\n'")
-	return branch
+local branch_cache = ""
+local last_check = 0
+local check_interval = 1000 -- Check git branch every 1 second
+
+local function async_git_branch()
+    local check_time = vim.loop.now()
+    if check_time - last_check < check_interval then
+        return branch_cache
+    end
+    last_check = check_time
+
+    local stdout = vim.loop.new_pipe(false)
+    local stderr = vim.loop.new_pipe(false)
+
+    local handle
+    handle = vim.loop.spawn("git", {
+        args = { "branch", "--show-current" },
+        stdio = { nil, stdout, stderr }
+    }, function(code, signal)
+        stdout:close()
+        stderr:close()
+        handle:close()
+    end)
+
+    if handle then
+        stdout:read_start(vim.schedule_wrap(function(err, data)
+            if data then
+                branch_cache = data:gsub("\n", "")
+            end
+        end))
+    end
+
+    return branch_cache
 end
 
 function M.statusline_git()
-	local branch_name = git_branch()
-	return #branch_name > 0 and '  ' .. branch_name .. ' ' or ''
+    local branch_name = async_git_branch()
+    return #branch_name > 0 and '  ' .. branch_name .. ' ' or ''
 end
 
+-- Rest of your statusline.lua remains exactly the same
 function M.setup()
-	vim.cmd('highlight clear StatusLine')
-	vim.cmd('highlight clear StatusLineNC')
-
-	local highlights = {
-		StatusLineGit      = { bg = "#161616", fg = "#D8DEE9" },
-		StatusLineBuffer   = { bg = "NONE",    fg = "#D8DEE9" },
-		StatusLine         = { bg = "NONE",    fg = "#D8DEE9" },
-		StatusLineFiletype = { bg = "NONE",    fg = "#D8DEE9" },
-		StatusLinePath     = { bg = "NONE",    fg = "#D8DEE9" },
-		StatusLineModified = { bg = "NONE",    fg = "#D8DEE9" },
-	}
-
-	for name, colors in pairs(highlights) do
-		vim.api.nvim_set_hl(0, name, colors)
-	end
-
-	vim.opt.statusline = table.concat({
-		"%#StatusLineGit#%{v:lua.require'core.statusline'.statusline_git()}",
-		"%#StatusLineBuffer# %n ",
-		"%#StatusLine#%{&ff} ",
-		"%#StatusLineFiletype#%y",
-		"%#StatusLinePath# %<%{expand('%:p:h')}/%f",
-		"%#StatusLineModified#%m",
-		"%=",
-		"%#StatusLine#%5l",
-		"/%L:%v ",
-		"%{char2nr(getline('.')[col('.')-1])} "
-	})
+    vim.cmd('highlight clear StatusLine')
+    vim.cmd('highlight clear StatusLineNC')
+
+    local highlights = {
+        StatusLineGit      = { bg = "#161616", fg = "#D8DEE9" },
+        StatusLineBuffer   = { bg = "NONE",    fg = "#D8DEE9" },
+        StatusLine        = { bg = "NONE",    fg = "#D8DEE9" },
+        StatusLineFiletype = { bg = "NONE",    fg = "#D8DEE9" },
+        StatusLinePath     = { bg = "NONE",    fg = "#D8DEE9" },
+        StatusLineModified = { bg = "NONE",    fg = "#D8DEE9" },
+    }
+
+    for name, colors in pairs(highlights) do
+        vim.api.nvim_set_hl(0, name, colors)
+    end
+
+    vim.opt.statusline = table.concat({
+        "%#StatusLineGit#%{v:lua.require'core.statusline'.statusline_git()}",
+        "%#StatusLineBuffer# %n ",
+        "%#StatusLine#%{&ff} ",
+        "%#StatusLineFiletype#%y",
+        "%#StatusLinePath# %<%{expand('%:p:h')}/%f",
+        "%#StatusLineModified#%m",
+        "%=",
+        "%#StatusLine#%5l",
+        "/%L:%v ",
+        "%{char2nr(getline('.')[col('.')-1])} "
+    })
 end
 
 vim.api.nvim_create_autocmd("ColorScheme", {
diff --git a/nvim/lua/plugins/auto-pairs.lua b/nvim/lua/plugins/auto-pairs.lua
index 7fdb560..1b9b728 100644
--- a/nvim/lua/plugins/auto-pairs.lua
+++ b/nvim/lua/plugins/auto-pairs.lua
@@ -2,6 +2,7 @@ return {
 	{
 		'windwp/nvim-autopairs',
 		event = "InsertEnter",
-		config = true
+		config = true,
+		lazy = false,
 	},
 }
diff --git a/nvim/lua/plugins/comment.lua b/nvim/lua/plugins/comment.lua
index e485b9b..f7fbda1 100644
--- a/nvim/lua/plugins/comment.lua
+++ b/nvim/lua/plugins/comment.lua
@@ -1,6 +1,7 @@
 return {
 	{
 		"numToStr/Comment.nvim",
+		lazy = false,
 		config = function()
 			require('Comment').setup({
 				---Add a space b/w comment and the line
diff --git a/nvim/lua/plugins/diffview.lua b/nvim/lua/plugins/diffview.lua
index ec440b1..fcd28c9 100644
--- a/nvim/lua/plugins/diffview.lua
+++ b/nvim/lua/plugins/diffview.lua
@@ -1,6 +1,7 @@
 return {
 	{
 		"sindrets/diffview.nvim",
+		lazy = false,
 		config = function()
 			-- TODO: keymaps
 			-- :DiffviewOpen
diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua
index 6ee0348..3f30f42 100644
--- a/nvim/lua/plugins/gitsigns.lua
+++ b/nvim/lua/plugins/gitsigns.lua
@@ -1,6 +1,7 @@
 return {
 	{
 		"lewis6991/gitsigns.nvim",
+		lazy = false,
 		config = function()
 
 			require('gitsigns').setup {
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index e33925e..aa8b8df 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -1,6 +1,7 @@
 return
 {
 	'VonHeikemen/lsp-zero.nvim',
+	lazy = false,
 	branch = 'v3.x',
 	dependencies = {
 		-- LSP Support
diff --git a/nvim/lua/plugins/markdown-preview.lua b/nvim/lua/plugins/markdown-preview.lua
index b325fdd..1fd1ac3 100644
--- a/nvim/lua/plugins/markdown-preview.lua
+++ b/nvim/lua/plugins/markdown-preview.lua
@@ -3,6 +3,7 @@ return {
 		"iamcco/markdown-preview.nvim",
 		cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
 		build = "cd app && yarn install",
+		lazy = false,
 		init = function()
 			vim.g.mkdp_filetypes = { "markdown" }
 		end,
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index bd26f0f..c2c4102 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -2,6 +2,7 @@ return {
 	{
 		'nvim-telescope/telescope.nvim', tag = '0.1.8',
 		dependencies = { 'nvim-lua/plenary.nvim' },
+		lazy = false,
 
 		config = function()
 			local builtin = require('telescope.builtin')
diff --git a/nvim/lua/plugins/todo-comments.lua b/nvim/lua/plugins/todo-comments.lua
index b62212c..340dbcd 100644
--- a/nvim/lua/plugins/todo-comments.lua
+++ b/nvim/lua/plugins/todo-comments.lua
@@ -3,6 +3,7 @@ return {
 	"folke/todo-comments.nvim",
 	dependencies = { "nvim-lua/plenary.nvim" },
 	event = { "BufReadPost", "BufNewFile" },
+	lazy = false,
 	config = function()
 		require("todo-comments").setup({
 			signs = true,
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index f3f4dd0..b7fe8fb 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -3,6 +3,7 @@ return {
 		"nvim-treesitter/nvim-treesitter",
 		build = ":TSUpdate",
 		event = { "BufReadPost", "BufNewFile" },
+		lazy = false,
 
 		config = function()
 			require("nvim-treesitter.configs").setup({
diff --git a/nvim/lua/plugins/undotree.lua b/nvim/lua/plugins/undotree.lua
index e874811..16d437e 100644
--- a/nvim/lua/plugins/undotree.lua
+++ b/nvim/lua/plugins/undotree.lua
@@ -1,6 +1,7 @@
 return {
 	{
 		"mbbill/undotree",
+		lazy = false,
 
 		config = function()
 			vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)