From 8122b15a28e70e364007841191ad270d24efc9db Mon Sep 17 00:00:00 2001 From: srdusr Date: Fri, 7 Apr 2023 09:20:33 +0200 Subject: Removed unnecessary comments --- lua/plugins/lsp.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index ca91c2f..46cc59c 100644 --- a/lua/plugins/lsp.lua +++ b/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", + "vimls", }, ui = { -- cgit v1.2.3 From 1f6c09177a78bd87b596973b30cac78f24f1c550 Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 12 Apr 2023 20:01:00 +0200 Subject: Allowed lazygit to use zsh user configuration --- lua/plugins/toggleterm.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua index a9bd450..f787f46 100644 --- a/lua/plugins/toggleterm.lua +++ b/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, -- cgit v1.2.3 From 044aead9d60a81e03cd60f11b6e34851f9093edf Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 12 Apr 2023 20:02:02 +0200 Subject: Clean config/remove comments --- lua/plugins/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 46cc59c..ea8a377 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -17,7 +17,7 @@ require("mason-lspconfig").setup({ "jedi_language_server", "rust_analyzer", "bashls", - "vimls", + "vimls" }, ui = { -- cgit v1.2.3 From b8c7bd6dc2edc26949c14418193f9ddd5fa49c02 Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 12 Apr 2023 20:04:40 +0200 Subject: Set bare dotfiles repository git environment variables dynamically --- lua/user/mods.lua | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/lua/user/mods.lua b/lua/user/mods.lua index 8a1f3f3..704ffdf 100644 --- a/lua/user/mods.lua +++ b/lua/user/mods.lua @@ -161,6 +161,50 @@ 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 -- cgit v1.2.3 From 2ab3737254ead09e9734dd37c62753848534f4f3 Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 12 Apr 2023 20:05:29 +0200 Subject: Clean config/remove comments --- lua/plugins/gitsigns.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index 53d1a1e..91fa65b 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -1 +1 @@ -require('gitsigns').setup {} +require('gitsigns').setup() -- cgit v1.2.3