4 files changed, 46 insertions, 4 deletions
diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua
index 53d1a1e..91fa65b 100644
--- a/.config/nvim/lua/plugins/gitsigns.lua
+++ b/.config/nvim/lua/plugins/gitsigns.lua
@@ -1 +1 @@
-require('gitsigns').setup {}
+require('gitsigns').setup()
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index ca91c2f..ea8a377 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -17,9 +17,7 @@ require("mason-lspconfig").setup({
     "jedi_language_server",
     "rust_analyzer",
     "bashls",
-    --"bash-language-server",
     "vimls"
-    --"vim-language-server",
 
   },
   ui = {
diff --git a/.config/nvim/lua/plugins/toggleterm.lua b/.config/nvim/lua/plugins/toggleterm.lua
index a9bd450..f787f46 100644
--- a/.config/nvim/lua/plugins/toggleterm.lua
+++ b/.config/nvim/lua/plugins/toggleterm.lua
@@ -114,7 +114,7 @@ function Lazygit_toggle()
       Cur_cwd = cwd
       lazygit:close()
       lazygit = Terminal:new({
-        cmd = "lazygit",
+        cmd = "zsh --login -c 'lazygit'",
         dir = "git_dir",
         direction = "float",
         hidden = true,
diff --git a/.config/nvim/lua/user/mods.lua b/.config/nvim/lua/user/mods.lua
index 8a1f3f3..704ffdf 100644
--- a/.config/nvim/lua/user/mods.lua
+++ b/.config/nvim/lua/user/mods.lua
@@ -163,4 +163,48 @@ end
 
 --------------------------------------------------
 
+-- Set bare dotfiles repository git environment variables dynamically
+
+-- Set git enviornment variables
+--function M.Set_git_env_vars()
+--  local git_dir_job = vim.fn.jobstart({ "git", "rev-parse", "--git-dir" })
+--  local command_status = vim.fn.jobwait({ git_dir_job })[1]
+--  if command_status > 0 then
+--    vim.env.GIT_DIR = vim.fn.expand("$HOME/.cfg")
+--    vim.env.GIT_WORK_TREE = vim.fn.expand("~")
+--  else
+--    vim.env.GIT_DIR = nil
+--    vim.env.GIT_WORK_TREE = nil
+--  end
+--  -- Launch terminal emulator with Git environment variables set
+--  --require("toggleterm").exec(string.format([[%s %s]], os.getenv("SHELL"), "-i"))
+--end
+
+------
+
+local prev_cwd = ""
+
+function M.Set_git_env_vars()
+  local cwd = vim.fn.getcwd()
+  if cwd ~= prev_cwd then
+    prev_cwd = cwd
+    local git_dir_job = vim.fn.jobstart({ "git", "rev-parse", "--git-dir" })
+    local command_status = vim.fn.jobwait({ git_dir_job })[1]
+    if command_status > 0 then
+      vim.env.GIT_DIR = vim.fn.expand("$HOME/.cfg")
+      vim.env.GIT_WORK_TREE = vim.fn.expand("~")
+    else
+      vim.env.GIT_DIR = nil
+      vim.env.GIT_WORK_TREE = nil
+    end
+  end
+end
+vim.cmd [[augroup my_git_env_vars]]
+vim.cmd [[  autocmd!]]
+vim.cmd [[  autocmd BufEnter * lua require('user.mods').Set_git_env_vars()]]
+vim.cmd [[  autocmd VimEnter * lua require('user.mods').Set_git_env_vars()]]
+vim.cmd [[augroup END]]
+
+--------------------------------------------------
+
 return M