From 288e8803b394f20702d8f462364484d75bf247a1 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Wed, 6 Mar 2024 09:52:33 -0800
Subject: [PATCH 01/15] Update font for Windows

---
 lua/config/ginit.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/config/ginit.lua b/lua/config/ginit.lua
index 2fb686f..dd4dbff 100644
--- a/lua/config/ginit.lua
+++ b/lua/config/ginit.lua
@@ -5,7 +5,7 @@ local font
 if vim.fn.has('unix') == 1 then
     font = 'Terminus:h12'
 elseif vim.fn.has('win32') == 1 then
-    font = 'Lucida Console:h8'
+    font = 'Cascadia Mono:h10'
 end
 
 if font then

From 20a34c5699d2e0a39b50be77010dd488be517cd7 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Wed, 27 Mar 2024 11:59:00 -0700
Subject: [PATCH 02/15] Add vim-jdaddy

---
 .gitmodules                   | 201 +++++++++++++++++-----------------
 pack/plugins/start/vim-jdaddy |   1 +
 2 files changed, 103 insertions(+), 99 deletions(-)
 create mode 160000 pack/plugins/start/vim-jdaddy

diff --git a/.gitmodules b/.gitmodules
index 584b0b3..0f86105 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,99 +1,102 @@
-[submodule ".vim/bundle/vim-argwrap"]
-	path = pack/plugins/start/vim-argwrap
-	url = https://git.foosoft.net/alex/vim-argwrap.git
-[submodule ".vim/bundle/vim-sort-motion"]
-	path = pack/plugins/start/vim-sort-motion
-	url = https://github.com/christoomey/vim-sort-motion.git
-[submodule ".vim/bundle/vim-go"]
-	path = pack/plugins/start/vim-go
-	url = https://github.com/fatih/vim-go.git
-[submodule ".vim/bundle/vim-easy-align"]
-	path = pack/plugins/start/vim-easy-align
-	url = https://github.com/junegunn/vim-easy-align.git
-[submodule ".vim/bundle/vim-indent-object"]
-	path = pack/plugins/start/vim-indent-object
-	url = https://github.com/michaeljsmith/vim-indent-object.git
-[submodule ".vim/bundle/vim-better-whitespace"]
-	path = pack/plugins/start/vim-better-whitespace
-	url = https://github.com/ntpeters/vim-better-whitespace.git
-[submodule ".vim/bundle/vim-abolish"]
-	path = pack/plugins/start/vim-abolish
-	url = https://github.com/tpope/vim-abolish.git
-[submodule ".vim/bundle/vim-repeat"]
-	path = pack/plugins/start/vim-repeat
-	url = https://github.com/tpope/vim-repeat
-[submodule ".vim/bundle/vim-surround"]
-	path = pack/plugins/start/vim-surround
-	url = https://github.com/tpope/vim-surround
-[submodule ".vim/bundle/vim-unimpaired"]
-	path = pack/plugins/start/vim-unimpaired
-	url = https://github.com/tpope/vim-unimpaired.git
-[submodule ".vim/bundle/vim-dirvish"]
-	path = pack/plugins/start/vim-dirvish
-	url = https://github.com/justinmk/vim-dirvish.git
-[submodule ".vim/bundle/vim-signify"]
-	path = pack/plugins/start/vim-signify
-	url = https://github.com/mhinz/vim-signify.git
-[submodule ".vim/bundle/vim-angry"]
-	path = pack/plugins/start/vim-angry
-	url = https://github.com/b4winckler/vim-angry.git
-[submodule ".vim/pack/plugins/start/vim-fugitive"]
-	path = pack/plugins/start/vim-fugitive
-	url = https://github.com/tpope/vim-fugitive.git
-[submodule "pack/plugins/start/vim-polyglot"]
-	path = pack/plugins/start/vim-polyglot
-	url = https://github.com/sheerun/vim-polyglot
-[submodule "pack/plugins/opt/cmp-nvim-lsp"]
-	path = pack/plugins/start/cmp-nvim-lsp
-	url = https://github.com/hrsh7th/cmp-nvim-lsp.git
-[submodule "pack/plugins/opt/nvim-lspconfig"]
-	path = pack/plugins/start/nvim-lspconfig
-	url = https://github.com/neovim/nvim-lspconfig.git
-[submodule "pack/plugins/opt/nvim-cmp"]
-	path = pack/plugins/start/nvim-cmp
-	url = https://github.com/hrsh7th/nvim-cmp.git
-[submodule "pack/plugins/opt/cmp-vsnip"]
-	path = pack/plugins/start/cmp-vsnip
-	url = https://github.com/hrsh7th/cmp-vsnip
-[submodule "pack/plugins/opt/vim-vsnip"]
-	path = pack/plugins/start/vim-vsnip
-	url = https://github.com/hrsh7th/vim-vsnip
-[submodule "pack/plugins/start/suda.vim"]
-	path = pack/plugins/start/suda.vim
-	url = https://github.com/lambdalisue/suda.vim.git
-[submodule "pack/plugins/start/plenary.nvim"]
-	path = pack/plugins/start/plenary.nvim
-	url = https://github.com/nvim-lua/plenary.nvim.git
-[submodule "pack/plugins/start/vim-rooter"]
-	path = pack/plugins/start/vim-rooter
-	url = https://github.com/airblade/vim-rooter.git
-[submodule "pack/plugins/start/fzf.vim"]
-	path = pack/plugins/start/fzf.vim
-	url = https://github.com/junegunn/fzf.vim.git
-[submodule "pack/plugins/start/fzf"]
-	path = pack/plugins/start/fzf
-	url = https://github.com/junegunn/fzf.git
-[submodule "pack/plugins/start/neodev.nvim"]
-	path = pack/plugins/start/neodev.nvim
-	url = https://github.com/folke/neodev.nvim.git
-[submodule "pack/plugins/start/cmp-nvim-lsp-signature-help"]
-	path = pack/plugins/start/cmp-nvim-lsp-signature-help
-	url = https://github.com/hrsh7th/cmp-nvim-lsp-signature-help.git
-[submodule "pack/plugins/start/nightfox.nvim"]
-	path = pack/plugins/start/nightfox.nvim
-	url = https://github.com/EdenEast/nightfox.nvim.git
-[submodule "pack/plugins/start/lualine.nvim"]
-	path = pack/plugins/start/lualine.nvim
-	url = https://github.com/nvim-lualine/lualine.nvim.git
-[submodule "pack/plugins/start/Comment.nvim"]
-	path = pack/plugins/start/Comment.nvim
-	url = https://github.com/numToStr/Comment.nvim.git
-[submodule "pack/plugins/start/guid.nvim"]
-	path = pack/plugins/start/guid.nvim
-	url = https://git.foosoft.net/alex/guid.nvim.git
-[submodule "pack/plugins/start/revolver.nvim"]
-	path = pack/plugins/start/revolver.nvim
-	url = https://git.foosoft.net/alex/revolver.nvim.git
-[submodule "pack/plugins/start/vim-quickhl"]
-	path = pack/plugins/start/vim-quickhl
-	url = https://github.com/t9md/vim-quickhl.git
+[submodule ".vim/bundle/vim-argwrap"]
+	path = pack/plugins/start/vim-argwrap
+	url = https://git.foosoft.net/alex/vim-argwrap.git
+[submodule ".vim/bundle/vim-sort-motion"]
+	path = pack/plugins/start/vim-sort-motion
+	url = https://github.com/christoomey/vim-sort-motion.git
+[submodule ".vim/bundle/vim-go"]
+	path = pack/plugins/start/vim-go
+	url = https://github.com/fatih/vim-go.git
+[submodule ".vim/bundle/vim-easy-align"]
+	path = pack/plugins/start/vim-easy-align
+	url = https://github.com/junegunn/vim-easy-align.git
+[submodule ".vim/bundle/vim-indent-object"]
+	path = pack/plugins/start/vim-indent-object
+	url = https://github.com/michaeljsmith/vim-indent-object.git
+[submodule ".vim/bundle/vim-better-whitespace"]
+	path = pack/plugins/start/vim-better-whitespace
+	url = https://github.com/ntpeters/vim-better-whitespace.git
+[submodule ".vim/bundle/vim-abolish"]
+	path = pack/plugins/start/vim-abolish
+	url = https://github.com/tpope/vim-abolish.git
+[submodule ".vim/bundle/vim-repeat"]
+	path = pack/plugins/start/vim-repeat
+	url = https://github.com/tpope/vim-repeat
+[submodule ".vim/bundle/vim-surround"]
+	path = pack/plugins/start/vim-surround
+	url = https://github.com/tpope/vim-surround
+[submodule ".vim/bundle/vim-unimpaired"]
+	path = pack/plugins/start/vim-unimpaired
+	url = https://github.com/tpope/vim-unimpaired.git
+[submodule ".vim/bundle/vim-dirvish"]
+	path = pack/plugins/start/vim-dirvish
+	url = https://github.com/justinmk/vim-dirvish.git
+[submodule ".vim/bundle/vim-signify"]
+	path = pack/plugins/start/vim-signify
+	url = https://github.com/mhinz/vim-signify.git
+[submodule ".vim/bundle/vim-angry"]
+	path = pack/plugins/start/vim-angry
+	url = https://github.com/b4winckler/vim-angry.git
+[submodule ".vim/pack/plugins/start/vim-fugitive"]
+	path = pack/plugins/start/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive.git
+[submodule "pack/plugins/start/vim-polyglot"]
+	path = pack/plugins/start/vim-polyglot
+	url = https://github.com/sheerun/vim-polyglot
+[submodule "pack/plugins/opt/cmp-nvim-lsp"]
+	path = pack/plugins/start/cmp-nvim-lsp
+	url = https://github.com/hrsh7th/cmp-nvim-lsp.git
+[submodule "pack/plugins/opt/nvim-lspconfig"]
+	path = pack/plugins/start/nvim-lspconfig
+	url = https://github.com/neovim/nvim-lspconfig.git
+[submodule "pack/plugins/opt/nvim-cmp"]
+	path = pack/plugins/start/nvim-cmp
+	url = https://github.com/hrsh7th/nvim-cmp.git
+[submodule "pack/plugins/opt/cmp-vsnip"]
+	path = pack/plugins/start/cmp-vsnip
+	url = https://github.com/hrsh7th/cmp-vsnip
+[submodule "pack/plugins/opt/vim-vsnip"]
+	path = pack/plugins/start/vim-vsnip
+	url = https://github.com/hrsh7th/vim-vsnip
+[submodule "pack/plugins/start/suda.vim"]
+	path = pack/plugins/start/suda.vim
+	url = https://github.com/lambdalisue/suda.vim.git
+[submodule "pack/plugins/start/plenary.nvim"]
+	path = pack/plugins/start/plenary.nvim
+	url = https://github.com/nvim-lua/plenary.nvim.git
+[submodule "pack/plugins/start/vim-rooter"]
+	path = pack/plugins/start/vim-rooter
+	url = https://github.com/airblade/vim-rooter.git
+[submodule "pack/plugins/start/fzf.vim"]
+	path = pack/plugins/start/fzf.vim
+	url = https://github.com/junegunn/fzf.vim.git
+[submodule "pack/plugins/start/fzf"]
+	path = pack/plugins/start/fzf
+	url = https://github.com/junegunn/fzf.git
+[submodule "pack/plugins/start/neodev.nvim"]
+	path = pack/plugins/start/neodev.nvim
+	url = https://github.com/folke/neodev.nvim.git
+[submodule "pack/plugins/start/cmp-nvim-lsp-signature-help"]
+	path = pack/plugins/start/cmp-nvim-lsp-signature-help
+	url = https://github.com/hrsh7th/cmp-nvim-lsp-signature-help.git
+[submodule "pack/plugins/start/nightfox.nvim"]
+	path = pack/plugins/start/nightfox.nvim
+	url = https://github.com/EdenEast/nightfox.nvim.git
+[submodule "pack/plugins/start/lualine.nvim"]
+	path = pack/plugins/start/lualine.nvim
+	url = https://github.com/nvim-lualine/lualine.nvim.git
+[submodule "pack/plugins/start/Comment.nvim"]
+	path = pack/plugins/start/Comment.nvim
+	url = https://github.com/numToStr/Comment.nvim.git
+[submodule "pack/plugins/start/guid.nvim"]
+	path = pack/plugins/start/guid.nvim
+	url = https://git.foosoft.net/alex/guid.nvim.git
+[submodule "pack/plugins/start/revolver.nvim"]
+	path = pack/plugins/start/revolver.nvim
+	url = https://git.foosoft.net/alex/revolver.nvim.git
+[submodule "pack/plugins/start/vim-quickhl"]
+	path = pack/plugins/start/vim-quickhl
+	url = https://github.com/t9md/vim-quickhl.git
+[submodule "pack/plugins/start/vim-jdaddy"]
+	path = pack/plugins/start/vim-jdaddy
+	url = https://github.com/tpope/vim-jdaddy.git
diff --git a/pack/plugins/start/vim-jdaddy b/pack/plugins/start/vim-jdaddy
new file mode 160000
index 0000000..23b6775
--- /dev/null
+++ b/pack/plugins/start/vim-jdaddy
@@ -0,0 +1 @@
+Subproject commit 23b67752cb869dd9c8f3109173b69aa96a1f3acf

From 1aacc80e6e4930fc08c36d079e9029e1ce280c14 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Wed, 27 Mar 2024 12:00:52 -0700
Subject: [PATCH 03/15] Update scripts

---
 lua/config/util.lua | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/lua/config/util.lua b/lua/config/util.lua
index af917c6..5c2ab74 100644
--- a/lua/config/util.lua
+++ b/lua/config/util.lua
@@ -5,6 +5,10 @@ end
 
 local function get_branch_parent()
     local author = invoke({'git', 'config', 'user.name'})
+    if #author == 0 then
+        print('User name is not set')
+        return
+    end
 
     local hash = invoke{
         'git',
@@ -22,6 +26,13 @@ local function get_branch_parent()
     end
 end
 
+local function edit_git_paths(names)
+    local root_dir = invoke({'git', 'rev-parse', '--show-toplevel'})
+    for name in string.gmatch(names, '[^\r\n]+') do
+        vim.cmd(string.format('e %s/%s', root_dir, name))
+    end
+end
+
 -- UnAlign
 vim.api.nvim_create_user_command(
     'UnAlign',
@@ -31,21 +42,22 @@ vim.api.nvim_create_user_command(
     {range = '%'}
 )
 
+-- Conflicts
+vim.api.nvim_create_user_command(
+    'Conflicts',
+    function(ctx)
+        edit_git_paths(invoke({'git', 'diff', '--name-only', '--diff-filter=U'}))
+    end,
+    {}
+)
+
 -- TopicEdit
 vim.api.nvim_create_user_command(
     'TopicEdit',
     function(ctx)
         local hash = get_branch_parent()
         if hash then
-            local names = invoke({'git', 'diff', '--name-only', hash})
-            if #names == 0 then
-                print('No files changed since previous author')
-            else
-                local root_dir = invoke({'git', 'rev-parse', '--show-toplevel'})
-                for name in string.gmatch(names, '[^\r\n]+') do
-                    vim.cmd(string.format('e %s/%s', root_dir, name))
-                end
-            end
+            edit_git_paths(invoke({'git', 'diff', '--name-only', hash}))
         end
     end,
     {}

From c7572aa2e87d51d49402a52818814bd8ecd2fba7 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 13 Apr 2024 11:56:10 -0700
Subject: [PATCH 04/15] Update font

---
 lua/config/ginit.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/config/ginit.lua b/lua/config/ginit.lua
index dd4dbff..81976be 100644
--- a/lua/config/ginit.lua
+++ b/lua/config/ginit.lua
@@ -3,7 +3,7 @@ vim.cmd.GuiPopupmenu(0)
 
 local font
 if vim.fn.has('unix') == 1 then
-    font = 'Terminus:h12'
+    font = 'Hack:h10'
 elseif vim.fn.has('win32') == 1 then
     font = 'Cascadia Mono:h10'
 end

From 966b30dc52f9d1c5883101d56f358adf32d0db86 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 13 Apr 2024 20:56:09 -0700
Subject: [PATCH 05/15] Update font

---
 lua/config/ginit.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/config/ginit.lua b/lua/config/ginit.lua
index 81976be..06317bb 100644
--- a/lua/config/ginit.lua
+++ b/lua/config/ginit.lua
@@ -3,7 +3,7 @@ vim.cmd.GuiPopupmenu(0)
 
 local font
 if vim.fn.has('unix') == 1 then
-    font = 'Hack:h10'
+    font = 'CaskaydiaCove Nerd Font Mono'
 elseif vim.fn.has('win32') == 1 then
     font = 'Cascadia Mono:h10'
 end

From 350331207a6b3919aace3d780964a86003f39480 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 13 Apr 2024 22:04:01 -0700
Subject: [PATCH 06/15] Update binaries

---
 ginit.vim                         |  6 +++---
 lua/config/ginit.lua              | 14 +++++---------
 pack/plugins/start/fzf            |  2 +-
 pack/plugins/start/fzf.vim        |  2 +-
 pack/plugins/start/lualine.nvim   |  2 +-
 pack/plugins/start/neodev.nvim    |  2 +-
 pack/plugins/start/nightfox.nvim  |  2 +-
 pack/plugins/start/nvim-cmp       |  2 +-
 pack/plugins/start/nvim-lspconfig |  2 +-
 pack/plugins/start/plenary.nvim   |  2 +-
 pack/plugins/start/suda.vim       |  2 +-
 pack/plugins/start/vim-dirvish    |  2 +-
 pack/plugins/start/vim-easy-align |  2 +-
 pack/plugins/start/vim-fugitive   |  2 +-
 pack/plugins/start/vim-go         |  2 +-
 pack/plugins/start/vim-signify    |  2 +-
 16 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/ginit.vim b/ginit.vim
index df7922f..189e745 100644
--- a/ginit.vim
+++ b/ginit.vim
@@ -1,3 +1,3 @@
-lua << EOF
-require('config.ginit')
-EOF
+" lua << EOF
+" require('config.ginit')
+" EOF
diff --git a/lua/config/ginit.lua b/lua/config/ginit.lua
index 06317bb..8796e69 100644
--- a/lua/config/ginit.lua
+++ b/lua/config/ginit.lua
@@ -1,13 +1,9 @@
 vim.cmd.GuiTabline(0)
 vim.cmd.GuiPopupmenu(0)
 
-local font
-if vim.fn.has('unix') == 1 then
-    font = 'CaskaydiaCove Nerd Font Mono'
-elseif vim.fn.has('win32') == 1 then
-    font = 'Cascadia Mono:h10'
-end
-
-if font then
-    vim.cmd.Guifont({args = {font}, bang = true})
+if vim.fn.has('win32') == 1 then
+    vim.cmd.Guifont({
+        args = {'Cascadia Mono:h10'},
+        bang = true
+    })
 end
diff --git a/pack/plugins/start/fzf b/pack/plugins/start/fzf
index 90b8187..e86b81b 160000
--- a/pack/plugins/start/fzf
+++ b/pack/plugins/start/fzf
@@ -1 +1 @@
-Subproject commit 90b818788249bb080f9eddcc4b36ad4080b55c5c
+Subproject commit e86b81bbf5c55344f4e29060b71eb1ab563296fe
diff --git a/pack/plugins/start/fzf.vim b/pack/plugins/start/fzf.vim
index f6cb5b1..45d96c9 160000
--- a/pack/plugins/start/fzf.vim
+++ b/pack/plugins/start/fzf.vim
@@ -1 +1 @@
-Subproject commit f6cb5b17897ff0c38f60fecd4b529678bcfec259
+Subproject commit 45d96c9cb1213204479593236dfabf911ff15443
diff --git a/pack/plugins/start/lualine.nvim b/pack/plugins/start/lualine.nvim
index 7d131a8..0a5a668 160000
--- a/pack/plugins/start/lualine.nvim
+++ b/pack/plugins/start/lualine.nvim
@@ -1 +1 @@
-Subproject commit 7d131a8d3ba5016229e8a1d08bf8782acea98852
+Subproject commit 0a5a66803c7407767b799067986b4dc3036e1983
diff --git a/pack/plugins/start/neodev.nvim b/pack/plugins/start/neodev.nvim
index b49b976..ce9a2e8 160000
--- a/pack/plugins/start/neodev.nvim
+++ b/pack/plugins/start/neodev.nvim
@@ -1 +1 @@
-Subproject commit b49b976cf2c28cd8283e9d74cb10885f6dd9e3d0
+Subproject commit ce9a2e8eaba5649b553529c5498acb43a6c317cd
diff --git a/pack/plugins/start/nightfox.nvim b/pack/plugins/start/nightfox.nvim
index a408e6b..ce0cdf8 160000
--- a/pack/plugins/start/nightfox.nvim
+++ b/pack/plugins/start/nightfox.nvim
@@ -1 +1 @@
-Subproject commit a408e6bb101066952b81de9c11be367114bd561f
+Subproject commit ce0cdf8538c8c0b9c8fb2884d3d1090c8faf515d
diff --git a/pack/plugins/start/nvim-cmp b/pack/plugins/start/nvim-cmp
index 04e0ca3..ce16de5 160000
--- a/pack/plugins/start/nvim-cmp
+++ b/pack/plugins/start/nvim-cmp
@@ -1 +1 @@
-Subproject commit 04e0ca376d6abdbfc8b52180f8ea236cbfddf782
+Subproject commit ce16de5665c766f39c271705b17fff06f7bcb84f
diff --git a/pack/plugins/start/nvim-lspconfig b/pack/plugins/start/nvim-lspconfig
index 41f40dc..b3014f2 160000
--- a/pack/plugins/start/nvim-lspconfig
+++ b/pack/plugins/start/nvim-lspconfig
@@ -1 +1 @@
-Subproject commit 41f40dc4b86f3e166cf08115f621001972565a20
+Subproject commit b3014f2209503944f2714cf27c95591433a0c7d8
diff --git a/pack/plugins/start/plenary.nvim b/pack/plugins/start/plenary.nvim
index 4f71c0c..8aad439 160000
--- a/pack/plugins/start/plenary.nvim
+++ b/pack/plugins/start/plenary.nvim
@@ -1 +1 @@
-Subproject commit 4f71c0c4a196ceb656c824a70792f3df3ce6bb6d
+Subproject commit 8aad4396840be7fc42896e3011751b7609ca4119
diff --git a/pack/plugins/start/suda.vim b/pack/plugins/start/suda.vim
index 8b0fc37..d0ccc1a 160000
--- a/pack/plugins/start/suda.vim
+++ b/pack/plugins/start/suda.vim
@@ -1 +1 @@
-Subproject commit 8b0fc3711760195aba104e2d190cff9af8267052
+Subproject commit d0ccc1a5172f6a26182238767e60e08b931d11fa
diff --git a/pack/plugins/start/vim-dirvish b/pack/plugins/start/vim-dirvish
index 0966b86..3851bed 160000
--- a/pack/plugins/start/vim-dirvish
+++ b/pack/plugins/start/vim-dirvish
@@ -1 +1 @@
-Subproject commit 0966b866580ec5cc8fbc26ee396a516d72600db5
+Subproject commit 3851bedb7f191b9a4a5531000b6fc0a8795cc9bb
diff --git a/pack/plugins/start/vim-easy-align b/pack/plugins/start/vim-easy-align
index 12dd631..9815a55 160000
--- a/pack/plugins/start/vim-easy-align
+++ b/pack/plugins/start/vim-easy-align
@@ -1 +1 @@
-Subproject commit 12dd6316974f71ce333e360c0260b4e1f81169c3
+Subproject commit 9815a55dbcd817784458df7a18acacc6f82b1241
diff --git a/pack/plugins/start/vim-fugitive b/pack/plugins/start/vim-fugitive
index fab00f7..dac8e5c 160000
--- a/pack/plugins/start/vim-fugitive
+++ b/pack/plugins/start/vim-fugitive
@@ -1 +1 @@
-Subproject commit fab00f7c0f3a08e860e39c7adeb8fbe849921a98
+Subproject commit dac8e5c2d85926df92672bf2afb4fc48656d96c7
diff --git a/pack/plugins/start/vim-go b/pack/plugins/start/vim-go
index 76cab33..feef9b3 160000
--- a/pack/plugins/start/vim-go
+++ b/pack/plugins/start/vim-go
@@ -1 +1 @@
-Subproject commit 76cab3355fee04e750f69ccd34787b2570c6de7a
+Subproject commit feef9b31507f8e942bcd21f9e1f22d587c83c72d
diff --git a/pack/plugins/start/vim-signify b/pack/plugins/start/vim-signify
index 7d538b7..8670143 160000
--- a/pack/plugins/start/vim-signify
+++ b/pack/plugins/start/vim-signify
@@ -1 +1 @@
-Subproject commit 7d538b77a5a8806e344b057f8846f6d0c035efa9
+Subproject commit 8670143f9e12ed1cd3c9b2c54f345cdd9a4baac3

From ec23ca5566faf1bdd30ef731f11edec27d06b57c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 14 Apr 2024 09:56:51 -0700
Subject: [PATCH 07/15] Enable ginit.lua again

---
 ginit.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ginit.vim b/ginit.vim
index 189e745..df7922f 100644
--- a/ginit.vim
+++ b/ginit.vim
@@ -1,3 +1,3 @@
-" lua << EOF
-" require('config.ginit')
-" EOF
+lua << EOF
+require('config.ginit')
+EOF

From 54b0a69482801f7dbd2cd90743825ab2e0cbd911 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Tue, 16 Apr 2024 10:43:31 -0700
Subject: [PATCH 08/15] Switch bat to use Nord theme

---
 lua/config/plugins.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
index 023a632..c3103e6 100644
--- a/lua/config/plugins.lua
+++ b/lua/config/plugins.lua
@@ -15,6 +15,8 @@ if vim.fn.executable('fzf') == 1 then
     vim.keymap.set('n', '<leader>fh', vim.cmd.History)
     vim.keymap.set('n', '<leader>fb', vim.cmd.Buffers)
     vim.keymap.set('n', '<leader>fl', vim.cmd.Lines)
+
+    vim.fn.setenv('BAT_THEME', 'Nord')
 end
 
 -- guid.nvim

From 67b7444ac31a635ed8b66998d70aae7dfa8af10a Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Tue, 16 Apr 2024 12:25:52 -0700
Subject: [PATCH 09/15] Add fzf-lua

---
 .gitmodules                |  3 +++
 lua/config/plugins.lua     | 22 +++++++---------------
 pack/plugins/start/fzf-lua |  1 +
 3 files changed, 11 insertions(+), 15 deletions(-)
 create mode 160000 pack/plugins/start/fzf-lua

diff --git a/.gitmodules b/.gitmodules
index 0f86105..afb7d0f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,3 +100,6 @@
 [submodule "pack/plugins/start/vim-jdaddy"]
 	path = pack/plugins/start/vim-jdaddy
 	url = https://github.com/tpope/vim-jdaddy.git
+[submodule "pack/plugins/start/fzf-lua"]
+	path = pack/plugins/start/fzf-lua
+	url = https://github.com/ibhagwan/fzf-lua.git
diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
index c3103e6..000050b 100644
--- a/lua/config/plugins.lua
+++ b/lua/config/plugins.lua
@@ -1,22 +1,14 @@
 -- comment.nvim
 require('Comment').setup()
 
--- fzf.vim
+-- fzf-lua
 if vim.fn.executable('fzf') == 1 then
-    vim.cmd([[
-        command! -bang -nargs=* Fs
-        \ call fzf#vim#grep(
-        \   'git grep --line-number -- '.shellescape(<q-args>), 0,
-        \   fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)
-    ]])
-
-    vim.keymap.set('n', '<leader>fg', vim.cmd.GFiles)
-    vim.keymap.set('n', '<leader>fs', vim.cmd.Fs)
-    vim.keymap.set('n', '<leader>fh', vim.cmd.History)
-    vim.keymap.set('n', '<leader>fb', vim.cmd.Buffers)
-    vim.keymap.set('n', '<leader>fl', vim.cmd.Lines)
-
-    vim.fn.setenv('BAT_THEME', 'Nord')
+    vim.keymap.set('n', '<leader>fb', require('fzf-lua').buffers)
+    vim.keymap.set('n', '<leader>fg', require('fzf-lua').git_files)
+    vim.keymap.set('n', '<leader>fh', require('fzf-lua').oldfiles)
+    vim.keymap.set('n', '<leader>fl', require('fzf-lua').lines)
+    vim.keymap.set('n', '<leader>fp', require('fzf-lua').grep)
+    vim.keymap.set('n', '<leader>fs', require('fzf-lua').live_grep_native)
 end
 
 -- guid.nvim
diff --git a/pack/plugins/start/fzf-lua b/pack/plugins/start/fzf-lua
new file mode 160000
index 0000000..743647f
--- /dev/null
+++ b/pack/plugins/start/fzf-lua
@@ -0,0 +1 @@
+Subproject commit 743647f639a83e41e283d2d7daa03a85e1fbf951

From ebb20dc30a76ce1eabfb1920dab2be8fdd857332 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Tue, 16 Apr 2024 12:27:21 -0700
Subject: [PATCH 10/15] Remove fzf

---
 .gitmodules                | 6 ------
 pack/plugins/start/fzf     | 1 -
 pack/plugins/start/fzf.vim | 1 -
 3 files changed, 8 deletions(-)
 delete mode 160000 pack/plugins/start/fzf
 delete mode 160000 pack/plugins/start/fzf.vim

diff --git a/.gitmodules b/.gitmodules
index afb7d0f..e29316a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -67,12 +67,6 @@
 [submodule "pack/plugins/start/vim-rooter"]
 	path = pack/plugins/start/vim-rooter
 	url = https://github.com/airblade/vim-rooter.git
-[submodule "pack/plugins/start/fzf.vim"]
-	path = pack/plugins/start/fzf.vim
-	url = https://github.com/junegunn/fzf.vim.git
-[submodule "pack/plugins/start/fzf"]
-	path = pack/plugins/start/fzf
-	url = https://github.com/junegunn/fzf.git
 [submodule "pack/plugins/start/neodev.nvim"]
 	path = pack/plugins/start/neodev.nvim
 	url = https://github.com/folke/neodev.nvim.git
diff --git a/pack/plugins/start/fzf b/pack/plugins/start/fzf
deleted file mode 160000
index e86b81b..0000000
--- a/pack/plugins/start/fzf
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e86b81bbf5c55344f4e29060b71eb1ab563296fe
diff --git a/pack/plugins/start/fzf.vim b/pack/plugins/start/fzf.vim
deleted file mode 160000
index 45d96c9..0000000
--- a/pack/plugins/start/fzf.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 45d96c9cb1213204479593236dfabf911ff15443

From d3b013b398e176a34b4b2cbf3e76b85c1aa5b7e2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 16 Apr 2024 18:32:28 -0700
Subject: [PATCH 11/15] fzf tweaks

---
 lua/config/plugins.lua | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
index 000050b..3a188f0 100644
--- a/lua/config/plugins.lua
+++ b/lua/config/plugins.lua
@@ -3,12 +3,23 @@ require('Comment').setup()
 
 -- fzf-lua
 if vim.fn.executable('fzf') == 1 then
-    vim.keymap.set('n', '<leader>fb', require('fzf-lua').buffers)
-    vim.keymap.set('n', '<leader>fg', require('fzf-lua').git_files)
-    vim.keymap.set('n', '<leader>fh', require('fzf-lua').oldfiles)
-    vim.keymap.set('n', '<leader>fl', require('fzf-lua').lines)
-    vim.keymap.set('n', '<leader>fp', require('fzf-lua').grep)
-    vim.keymap.set('n', '<leader>fs', require('fzf-lua').live_grep_native)
+    local fzf_lua = require('fzf-lua')
+    fzf_lua.setup({
+        winopts = {
+            preview = {
+                winopts = {
+                    cursorline = false,
+                },
+            },
+        },
+    })
+
+    vim.keymap.set('n', '<leader>fb', fzf_lua.buffers)
+    vim.keymap.set('n', '<leader>fg', fzf_lua.git_files)
+    vim.keymap.set('n', '<leader>fh', fzf_lua.oldfiles)
+    vim.keymap.set('n', '<leader>fl', fzf_lua.lines)
+    vim.keymap.set('n', '<leader>fp', fzf_lua.grep)
+    vim.keymap.set('n', '<leader>fs', fzf_lua.live_grep_native)
 end
 
 -- guid.nvim

From 5e3d5ff2d9f9ab0514cd9e150d828dc24bb1cfc9 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 16 Apr 2024 19:48:17 -0700
Subject: [PATCH 12/15] Update plugins

---
 pack/plugins/start/fzf-lua        | 2 +-
 pack/plugins/start/nvim-lspconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pack/plugins/start/fzf-lua b/pack/plugins/start/fzf-lua
index 743647f..62cb8f3 160000
--- a/pack/plugins/start/fzf-lua
+++ b/pack/plugins/start/fzf-lua
@@ -1 +1 @@
-Subproject commit 743647f639a83e41e283d2d7daa03a85e1fbf951
+Subproject commit 62cb8f37b3a017e6b2401726c96e02498f332b70
diff --git a/pack/plugins/start/nvim-lspconfig b/pack/plugins/start/nvim-lspconfig
index b3014f2..9266dc2 160000
--- a/pack/plugins/start/nvim-lspconfig
+++ b/pack/plugins/start/nvim-lspconfig
@@ -1 +1 @@
-Subproject commit b3014f2209503944f2714cf27c95591433a0c7d8
+Subproject commit 9266dc26862d8f3556c2ca77602e811472b4c5b8

From df4336aacd6cb2fd1d6f87a9524b0ac1be224cc7 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alyatsko@microsoft.com>
Date: Wed, 17 Apr 2024 09:18:59 -0700
Subject: [PATCH 13/15] Update buffer close

---
 lua/config/common.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/config/common.lua b/lua/config/common.lua
index e4fb77e..3f5a157 100644
--- a/lua/config/common.lua
+++ b/lua/config/common.lua
@@ -36,7 +36,7 @@ vim.opt.writebackup = false
 
 -- common keymaps
 vim.keymap.set('i', '<c-c>', '<esc>')
-vim.keymap.set('n', '<bs>', '<cmd>bd<cr>')
+vim.keymap.set('n', '<bs>', '<cmd>bp|bd #<cr>')
 vim.keymap.set('n', '<c-c><c-c>', '<cmd>nohlsearch<cr>')
 vim.keymap.set('n', '<leader><leader>', '<cmd>b#<cr>')
 vim.keymap.set('n', '<leader>w', '<cmd>w<cr>')

From c73f688f2ce9d1f657d77efa49fe31f21439b8e2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 19 Apr 2024 19:21:42 -0700
Subject: [PATCH 14/15] Update git commands

---
 lua/config/util.lua | 54 ++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/lua/config/util.lua b/lua/config/util.lua
index 5c2ab74..2a2c8ca 100644
--- a/lua/config/util.lua
+++ b/lua/config/util.lua
@@ -1,9 +1,22 @@
+-- UnAlign
+vim.api.nvim_create_user_command(
+    'UnAlign',
+    function(ctx)
+        vim.cmd(ctx.line1 .. ',' .. ctx.line2 .. 's/\\(\\S\\+\\)\\s\\{2,\\}/\\1 /g')
+    end,
+    {range = '%'}
+)
+
 local function invoke(args)
-    output = vim.fn.system(table.concat(args, ' '))
+    local output = vim.fn.system(table.concat(args, ' '))
     return string.gsub(output, '%s+$', '')
 end
 
-local function get_branch_parent()
+local function git_branch_parent(branch)
+    if branch ~= '' then
+        return branch
+    end
+
     local author = invoke({'git', 'config', 'user.name'})
     if #author == 0 then
         print('User name is not set')
@@ -26,51 +39,42 @@ local function get_branch_parent()
     end
 end
 
-local function edit_git_paths(names)
+local function git_edit_paths(names)
     local root_dir = invoke({'git', 'rev-parse', '--show-toplevel'})
     for name in string.gmatch(names, '[^\r\n]+') do
         vim.cmd(string.format('e %s/%s', root_dir, name))
     end
 end
 
--- UnAlign
+-- GitConflicts
 vim.api.nvim_create_user_command(
-    'UnAlign',
-    function(ctx)
-        vim.cmd(ctx.line1 .. ',' .. ctx.line2 .. 's/\\(\\S\\+\\)\\s\\{2,\\}/\\1 /g')
-    end,
-    {range = '%'}
-)
-
--- Conflicts
-vim.api.nvim_create_user_command(
-    'Conflicts',
-    function(ctx)
-        edit_git_paths(invoke({'git', 'diff', '--name-only', '--diff-filter=U'}))
+    'GitConflicts',
+    function()
+        git_edit_paths(invoke({'git', 'diff', '--name-only', '--diff-filter=U'}))
     end,
     {}
 )
 
--- TopicEdit
+-- GitTopicEdit
 vim.api.nvim_create_user_command(
-    'TopicEdit',
+    'GitTopicEdit',
     function(ctx)
-        local hash = get_branch_parent()
+        local hash = git_branch_parent(ctx.args)
         if hash then
-            edit_git_paths(invoke({'git', 'diff', '--name-only', hash}))
+            git_edit_paths(invoke({'git', 'diff', '--name-only', hash}))
         end
     end,
-    {}
+    {nargs = '?'}
 )
 
--- TopicDiff
+-- GitTopicDiff
 vim.api.nvim_create_user_command(
-    'TopicDiff',
+    'GitTopicDiff',
     function(ctx)
-        local hash = get_branch_parent()
+        local hash = git_branch_parent(ctx.args)
         if hash then
             invoke({'git', 'difftool', '-d', hash})
         end
     end,
-    {}
+    {nargs = '?'}
 )

From 4048b8f59b6e145331ac033dad761d566c5483f9 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 19 Apr 2024 19:33:16 -0700
Subject: [PATCH 15/15] Update git utils

---
 lua/config/util.lua | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lua/config/util.lua b/lua/config/util.lua
index 2a2c8ca..f74efab 100644
--- a/lua/config/util.lua
+++ b/lua/config/util.lua
@@ -12,9 +12,16 @@ local function invoke(args)
     return string.gsub(output, '%s+$', '')
 end
 
-local function git_branch_parent(branch)
-    if branch ~= '' then
-        return branch
+local function git_parent_branch(parent_branch)
+    for _, branch in ipairs({'master', 'main'}) do
+        local output = invoke({'git', 'rev-parse', '--verify', branch})
+        if not string.find(output, 'fatal') then
+            parent_branch = branch
+        end
+    end
+
+    if parent_branch ~= '' then
+        return parent_branch
     end
 
     local author = invoke({'git', 'config', 'user.name'})
@@ -59,7 +66,7 @@ vim.api.nvim_create_user_command(
 vim.api.nvim_create_user_command(
     'GitTopicEdit',
     function(ctx)
-        local hash = git_branch_parent(ctx.args)
+        local hash = git_parent_branch(ctx.args)
         if hash then
             git_edit_paths(invoke({'git', 'diff', '--name-only', hash}))
         end
@@ -71,7 +78,7 @@ vim.api.nvim_create_user_command(
 vim.api.nvim_create_user_command(
     'GitTopicDiff',
     function(ctx)
-        local hash = git_branch_parent(ctx.args)
+        local hash = git_parent_branch(ctx.args)
         if hash then
             invoke({'git', 'difftool', '-d', hash})
         end