diff options
| author | kylo252 <[email protected]> | 2022-09-04 16:20:14 +0200 |
|---|---|---|
| committer | kylo252 <[email protected]> | 2022-09-04 16:20:14 +0200 |
| commit | 50494d62a99b1d0767f330f66f2df0458d2c5da0 (patch) | |
| tree | f76758ef247fcab5f9c8b7c565560792acaf445d /lua/lvim/core | |
| parent | b3bceadfddce9843850cb375edb9d470ca75b61b (diff) | |
| parent | 256e4b8e70994761957b84cb24151fcdfcaa74e6 (diff) | |
Merge remote-tracking branch 'origin/rolling'
Diffstat (limited to 'lua/lvim/core')
| -rw-r--r-- | lua/lvim/core/cmp.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/core/lualine/components.lua | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua index 10cf56be..7b0b0e6e 100644 --- a/lua/lvim/core/cmp.lua +++ b/lua/lvim/core/cmp.lua @@ -265,7 +265,7 @@ M.config = function() ["<C-e>"] = cmp.mapping.abort(), ["<CR>"] = cmp.mapping(function(fallback) if cmp.visible() then - local confirm_opts = lvim.builtin.cmp.confirm_opts + local confirm_opts = vim.deepcopy(lvim.builtin.cmp.confirm_opts) -- avoid mutating the original opts below local is_insert_mode = function() return vim.api.nvim_get_mode().mode:sub(1, 1) == "i" end diff --git a/lua/lvim/core/lualine/components.lua b/lua/lvim/core/lualine/components.lua index 5095cfb4..c88bf82b 100644 --- a/lua/lvim/core/lualine/components.lua +++ b/lua/lvim/core/lualine/components.lua @@ -47,15 +47,10 @@ return { function() local utils = require "lvim.core.lualine.utils" if vim.bo.filetype == "python" then - local venv = os.getenv "CONDA_DEFAULT_ENV" + local venv = os.getenv "CONDA_DEFAULT_ENV" or os.getenv "VIRTUAL_ENV" if venv then return string.format("  (%s)", utils.env_cleanup(venv)) end - venv = os.getenv "VIRTUAL_ENV" - if venv then - return string.format("  (%s)", utils.env_cleanup(venv)) - end - return "" end return "" end, |