diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index 322509d..eb17373 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -15,4 +15,3 @@ end vim.opt.runtimepath:prepend(lazypath) require("my.init").setup() - diff --git a/dotfiles/neovim/lazy-lock.json b/dotfiles/neovim/lazy-lock.json index e6ff9a8..6382756 100644 --- a/dotfiles/neovim/lazy-lock.json +++ b/dotfiles/neovim/lazy-lock.json @@ -25,7 +25,6 @@ "knap": { "branch": "main", "commit": "62eae7803d9d87d33513b3b565c6f5791f1de1ea" }, "kotlin-vim": { "branch": "master", "commit": "1261f851e5fb2192b3a5e1691650597c71dfce2f" }, "lazy.nvim": { "branch": "main", "commit": "0d0d11acb2547ea65e0eba4fb6855f0954ed0239" }, - "lean.nvim": { "branch": "main", "commit": "0f7326f7e55ddbb69c057051566f5212d902b7f3" }, "leap": { "branch": "main", "commit": "a5c9504290832e6bdbbb6265fd1ff02fc6485d20" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "fffbcb829288c3ca366f17cdb8d46aefb5c1d6f3" }, diff --git a/dotfiles/neovim/lua/my/helpers/env.lua b/dotfiles/neovim/lua/my/helpers/env.lua index 312056c..5c6d32a 100644 --- a/dotfiles/neovim/lua/my/helpers/env.lua +++ b/dotfiles/neovim/lua/my/helpers/env.lua @@ -22,7 +22,7 @@ return { return vim.g.vscode ~= nil end), neovide = makeEnv(function() - return vim.g.neovide ~= nil or os.getenv("INSIDE_NEOVIDE") ~= nil + return vim.g.neovide ~= nil or os.getenv("INSIDE_NEOVIDE") == "1" end), firenvim = makeEnv(function() return vim.g.started_by_firenvim ~= nil diff --git a/dotfiles/neovim/lua/my/neovide.lua b/dotfiles/neovim/lua/my/neovide.lua index bea1b2f..3d7adf7 100644 --- a/dotfiles/neovim/lua/my/neovide.lua +++ b/dotfiles/neovim/lua/my/neovide.lua @@ -1,18 +1,22 @@ local M = {} function M.setup() + local default_length = 0.04 vim.g.neovide_floating_blur_amount_x = 3.0 vim.g.neovide_floating_blur_amount_y = 3.0 vim.g.neovide_transparency = 1.0 vim.g.pumblend = 30 + vim.g.neovide_cursor_animation_length = default_length vim.api.nvim_create_autocmd("WinEnter", { group = vim.api.nvim_create_augroup("Setup transparency", {}), pattern = "*", callback = function() vim.wo.winblend = 30 - end + end, }) + + vim.g.neovide_cursor_animate_in_insert_mode = false end return M diff --git a/dotfiles/neovim/lua/my/plugins/init.lua b/dotfiles/neovim/lua/my/plugins/init.lua index 1716c8e..734300d 100644 --- a/dotfiles/neovim/lua/my/plugins/init.lua +++ b/dotfiles/neovim/lua/my/plugins/init.lua @@ -86,7 +86,7 @@ return { { -- easly switch between tmux and vim panes "christoomey/vim-tmux-navigator", - keys = { "C-h", "C-j", "C-k", "C-l" }, + keys = { "", "", "", "" }, cond = env.vscode.not_active() and env.neovide.not_active() and env.firenvim.not_active(), @@ -102,7 +102,8 @@ return { { -- smooth scrolling "psliwka/vim-smoothie", - enabled = env.neovide.not_active(), + -- enabled = env.neovide.not_active(), + enabled = false, event = "VeryLazy", },