From 213e416461a7b5623591acd8c9950cd2bce3499d Mon Sep 17 00:00:00 2001
From: doylet <doyle.github.2ifxi@simplelogin.com>
Date: Thu, 4 Jul 2024 22:08:49 +1000
Subject: [PATCH] Update scripts

---
 Internal/os_nvim_init.vim | 26 +++++++++++++-------------
 Win/Scripts/msys2_env.bat |  5 +++--
 Win/Scripts/remedybg.bat  |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Internal/os_nvim_init.vim b/Internal/os_nvim_init.vim
index daffa3b..3516533 100644
--- a/Internal/os_nvim_init.vim
+++ b/Internal/os_nvim_init.vim
@@ -24,7 +24,6 @@ call plug#begin(stdpath('config') . '/plugged')
 
     " Harpoon //////////////////////////////////////////////////////////////////////////////////////
     Plug 'nvim-lua/plenary.nvim'
-    Plug 'ThePrimeagen/harpoon', {'branch': 'harpoon2'}
 
     " lsp-zero begin
         " LSP Support
@@ -157,18 +156,6 @@ lua <<EOF
   --   enable_suggestions_on_files   = "*",  -- pattern matching syntax to enable suggestions on specific files, either a string or a list of strings
   -- })
 
-  -- Harpoon ///////////////////////////////////////////////////////////////////////////////////////
-  local harpoon = require('harpoon')
-  harpoon:setup()
-  vim.keymap.set("n", "<M-0>",     function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
-  vim.keymap.set("n", "<M-a>",     function() harpoon:list():prepend() end)
-  vim.keymap.set("n", "<M-1>",     function() harpoon:list():select(1) end)
-  vim.keymap.set("n", "<M-2>",     function() harpoon:list():select(2) end)
-  vim.keymap.set("n", "<M-3>",     function() harpoon:list():select(3) end)
-  vim.keymap.set("n", "<M-4>",     function() harpoon:list():select(4) end)
-  vim.keymap.set("n", "<M-h>",     function() harpoon:list():prev() end)
-  vim.keymap.set("n", "<M-l>",     function() harpoon:list():next() end)
-
   -- Treesitter ////////////////////////////////////////////////////////////////////////////////////
   -- TODO: 2022-06-19 Treesitter is too slow on large C++ files
   -- require('nvim-treesitter.configs').setup {
@@ -193,6 +180,19 @@ lua <<EOF
   --   },
   -- }
 
+
+  -- Per-Project Bindings /////////////////////////////////////////////////////////////////////////////
+  -- Automatically load project file on buffer enter
+  vim.api.nvim_create_autocmd({"BufEnter"}, {
+    pattern = {"*.c", "*.h"},
+    callback = function(ev)
+      local project_file = vim.fn.expand('%:p:h') .. '/project_nvim.lua'
+      if vim.fn.filereadable(project_file) == 1 then
+          vim.cmd('luafile ' .. vim.fn.fnameescape(project_file))
+      end
+    end
+  })
+
   -- Vim Options ///////////////////////////////////////////////////////////////////////////////////
   vim.opt.autowrite=true        -- Automatically save before cmds like :next and :prev
   vim.opt.colorcolumn={80, 100} -- Set a 80 and 100 char column ruler
diff --git a/Win/Scripts/msys2_env.bat b/Win/Scripts/msys2_env.bat
index e628a8b..038d102 100644
--- a/Win/Scripts/msys2_env.bat
+++ b/Win/Scripts/msys2_env.bat
@@ -24,5 +24,6 @@ goto :eof
 set msys_env=%~1
 for /f "tokens=1,* delims= " %%a in ("%*") do set remaining_args=%%b
 
-echo [SCRIPT] Executing '%devenver_root%\MSYS2\20240113\msys2_shell.cmd -%msys_env% -no-start -defterm -here -c "%remaining_args%"
-%devenver_root%\MSYS2\20240113\msys2_shell.cmd -%msys_env% -no-start -defterm -here -c "%remaining_args%"
+set cmd=%devenver_root%\MSYS2\20240113\msys2_shell.cmd -%msys_env% -no-start -defterm -here -c "%remaining_args%"
+echo [SCRIPT] Executing '%cmd%'
+%cmd%
diff --git a/Win/Scripts/remedybg.bat b/Win/Scripts/remedybg.bat
index 1a763a8..50bff34 100644
--- a/Win/Scripts/remedybg.bat
+++ b/Win/Scripts/remedybg.bat
@@ -1,6 +1,6 @@
 @echo off
 setlocal
-  set desired_path=%devenver_root%\RemedyBG\0_3_9_6
+  set desired_path=%devenver_root%\RemedyBG\0_4_0_3
   set desired_exe=remedybg.exe
   set path=%desired_path%;%path%
   set exe_to_use=""