diff --git a/init.lua b/init.lua index c4bc5d4..dc86f5d 100644 --- a/init.lua +++ b/init.lua @@ -63,6 +63,4 @@ vim.keymap.set("n", "l", "Lazy") -- GUI settings if vim.g.neovide then require "ui.neovide" -elseif vim.g.vscode then - require "ui.vscode" end diff --git a/lua/plugins/alpha.lua b/lua/plugins/alpha.lua index e4382ac..b477432 100644 --- a/lua/plugins/alpha.lua +++ b/lua/plugins/alpha.lua @@ -1,6 +1,5 @@ return { "goolord/alpha-nvim", - cond = not vim.g.vscode, event = "VimEnter", opts = function() local dashboard = require "alpha.themes.dashboard" diff --git a/lua/plugins/barbar.lua b/lua/plugins/barbar.lua index 34fcf3e..ddd0803 100644 --- a/lua/plugins/barbar.lua +++ b/lua/plugins/barbar.lua @@ -1,6 +1,5 @@ return { "romgrk/barbar.nvim", - cond = not vim.g.vscode, version = "^1.0.0", -- optional: only update when a new 1.x version is released dependencies = { "lewis6991/gitsigns.nvim", "nvim-tree/nvim-web-devicons" }, event = { "BufReadPre", "BufNewFile" }, diff --git a/lua/plugins/barbecue.lua b/lua/plugins/barbecue.lua index e04d107..65083fe 100644 --- a/lua/plugins/barbecue.lua +++ b/lua/plugins/barbecue.lua @@ -1,6 +1,5 @@ return { "utilyre/barbecue.nvim", - cond = not vim.g.vscode, name = "barbecue", version = "*", event = { "BufReadPre", "BufNewFile" }, diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua index 42254b9..58100fc 100644 --- a/lua/plugins/comment.lua +++ b/lua/plugins/comment.lua @@ -1,6 +1,5 @@ return { "numToStr/Comment.nvim", - cond = not vim.g.vscode, dependencites = { "nvim-treesitter" }, keys = { "gc", "gb" }, config = true, diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua index d3012ef..7e9ea04 100644 --- a/lua/plugins/diffview.lua +++ b/lua/plugins/diffview.lua @@ -1,6 +1,5 @@ return { "sindrets/diffview.nvim", - cond = not vim.g.vscode, dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" }, cmd = { "DiffviewFileHistory", diff --git a/lua/plugins/direnv.lua b/lua/plugins/direnv.lua index c7b5895..b9dc6af 100644 --- a/lua/plugins/direnv.lua +++ b/lua/plugins/direnv.lua @@ -1,6 +1,6 @@ return { "https://github.com/direnv/direnv.vim.git", - cond = function() return vim.fn.executable("direnv") == 1 and not vim.g.vscode end, + cond = function() return vim.fn.executable("direnv") == 1 end, name = "direnv.vim", event = { "DirChangedPre" }, config = function() diff --git a/lua/plugins/dressing.lua b/lua/plugins/dressing.lua index 955e22e..a986122 100644 --- a/lua/plugins/dressing.lua +++ b/lua/plugins/dressing.lua @@ -1,6 +1,5 @@ return { "stevearc/dressing.nvim", lazy = true, - cond = not vim.g.vscode, config = true, } diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index 6ab2e11..e25d158 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -1,6 +1,5 @@ return { "lewis6991/gitsigns.nvim", - cond = not vim.g.vscode, event = { "BufReadPre", "BufNewFile" }, config = true, opts = { diff --git a/lua/plugins/indent_blankline.lua b/lua/plugins/indent_blankline.lua index 7be9df0..6564e43 100644 --- a/lua/plugins/indent_blankline.lua +++ b/lua/plugins/indent_blankline.lua @@ -1,6 +1,5 @@ return { "lukas-reineke/indent-blankline.nvim", - cond = not vim.g.vscode, dependencies = {"nvim-treesitter"}, event = { "BufReadPre", "BufNewFile" }, config = true, diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 8a10fbd..3415a3c 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -85,7 +85,6 @@ end return { "neovim/nvim-lspconfig", - cond = not vim.g.vscode, event = { "BufReadPre", "BufNewFile" }, dependencies = { "cmp-nvim-lsp", "folke/trouble.nvim", "folke/neodev.nvim", "jose-elias-alvarez/null-ls.nvim" }, config = config, diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index d4e7421..3870a8c 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,6 +1,5 @@ return { "nvim-lualine/lualine.nvim", - cond = not vim.g.vscode, dependencies = { "nvim-tree/nvim-web-devicons", "folke/noice.nvim", "folke/tokyonight.nvim" }, event = { "VeryLazy" }, config = true, @@ -25,11 +24,11 @@ return { hint = " ", }, }, - { - require("noice").api.status.mode.get, - cond = require("noice").api.status.mode.has, - color = { fg = "#ff9e64" }, - }, + -- { + -- require("noice").api.status.mode.get, + -- cond = require("noice").api.status.mode.has, + -- color = { fg = "#ff9e64" }, + -- }, }, lualine_x = { "filetype", "fileformat", "encoding" }, lualine_y = { "progress" }, diff --git a/lua/plugins/luasnip.lua b/lua/plugins/luasnip.lua index b4610a3..2830d48 100644 --- a/lua/plugins/luasnip.lua +++ b/lua/plugins/luasnip.lua @@ -1,6 +1,5 @@ return { "L3MON4D3/LuaSnip", - cond = not vim.g.vscode, lazy = true, dependencies = { "rafamadriz/friendly-snippets", diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua index f4c7a35..6c56986 100644 --- a/lua/plugins/neogit.lua +++ b/lua/plugins/neogit.lua @@ -1,6 +1,5 @@ return { "NeogitOrg/neogit", - cond = not vim.g.vscode, dependencies = { "nvim-lua/plenary.nvim", "sindrets/diffview.nvim", diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index 72cf68d..fd8825f 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -1,6 +1,6 @@ return { "folke/noice.nvim", - cond = not vim.g.vscode, + cond = not vim.g.neovide, event = { "VeryLazy" }, dependencies = { "MunifTanjim/nui.nvim", diff --git a/lua/plugins/notify.lua b/lua/plugins/notify.lua index 4adb49d..a4237a2 100644 --- a/lua/plugins/notify.lua +++ b/lua/plugins/notify.lua @@ -1,6 +1,5 @@ return { "rcarriga/nvim-notify", - cond = not vim.g.vscode, lazy = true, config = true, opts = { diff --git a/lua/plugins/nvim_cmp.lua b/lua/plugins/nvim_cmp.lua index 3358b70..7d97a7b 100644 --- a/lua/plugins/nvim_cmp.lua +++ b/lua/plugins/nvim_cmp.lua @@ -44,7 +44,6 @@ end return { "hrsh7th/nvim-cmp", - cond = not vim.g.vscode, event = "InsertEnter", dependencies = { "hrsh7th/cmp-nvim-lsp", diff --git a/lua/plugins/nvim_navbuddy.lua b/lua/plugins/nvim_navbuddy.lua index 05523a9..ee4a862 100644 --- a/lua/plugins/nvim_navbuddy.lua +++ b/lua/plugins/nvim_navbuddy.lua @@ -1,6 +1,5 @@ return { "SmiteshP/nvim-navbuddy", - cond = not vim.g.vscode, dependencies = { "SmiteshP/nvim-navic", "MunifTanjim/nui.nvim", diff --git a/lua/plugins/nvim_navic.lua b/lua/plugins/nvim_navic.lua index e31b9fa..80e8226 100644 --- a/lua/plugins/nvim_navic.lua +++ b/lua/plugins/nvim_navic.lua @@ -1,6 +1,5 @@ return { "SmiteshP/nvim-navic", - cond = not vim.g.vscode, dependencies = "neovim/nvim-lspconfig", lazy = true, config = true, diff --git a/lua/plugins/nvim_neorg.lua b/lua/plugins/nvim_neorg.lua index b56704a..c79e24a 100644 --- a/lua/plugins/nvim_neorg.lua +++ b/lua/plugins/nvim_neorg.lua @@ -1,6 +1,6 @@ return { "nvim-neorg/neorg", - cond = function() return vim.fn.executable "nix" == 1 and not vim.g.vscode end, + cond = function() return vim.fn.executable "nix" == 1 end, build = ":Neorg sync-parsers", ft = "norg", cmd = "Neorg", diff --git a/lua/plugins/nvim_neotest.lua b/lua/plugins/nvim_neotest.lua index ab66a20..e0eb75e 100644 --- a/lua/plugins/nvim_neotest.lua +++ b/lua/plugins/nvim_neotest.lua @@ -1,6 +1,5 @@ return { "nvim-neotest/neotest", - cond = not vim.g.vscode, lazy = true, dependencies = { "nvim-lua/plenary.nvim", diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua index 2d6864a..7912150 100644 --- a/lua/plugins/oil.lua +++ b/lua/plugins/oil.lua @@ -1,6 +1,5 @@ return { "stevearc/oil.nvim", - cond = not vim.g.vscode, dependencies = { "nvim-tree/nvim-web-devicons" }, cmd = "Oil", init = function() diff --git a/lua/plugins/project.lua b/lua/plugins/project.lua index 5b5bc57..7264d95 100644 --- a/lua/plugins/project.lua +++ b/lua/plugins/project.lua @@ -1,6 +1,5 @@ return { "ahmedkhalf/project.nvim", - cond = not vim.g.neovide and not vim.g.vscode, name = "project_nvim", event = { "BufReadPre", "BufNewFile" }, config = true, diff --git a/lua/plugins/symbols-outline.lua b/lua/plugins/symbols-outline.lua index bb8abc8..30c4634 100644 --- a/lua/plugins/symbols-outline.lua +++ b/lua/plugins/symbols-outline.lua @@ -1,6 +1,5 @@ return { "simrat39/symbols-outline.nvim", - cond = not vim.g.vscode, cmd = "SymbolsOutline", dependencies = { "neovim/nvim-lspconfig" }, init = function() vim.keymap.set("n", "no", "SymbolsOutline ") end, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 06b49aa..78678a9 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -1,13 +1,11 @@ return { "nvim-telescope/telescope.nvim", - cond = not vim.g.vscode, branch = "0.1.x", dependencies = { { { "nvim-lua/plenary.nvim" }, { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, { "tsakirist/telescope-lazy.nvim", dependencies = { "folke/lazy.nvim" } }, - { "folke/noice.nvim" }, { "benfowler/telescope-luasnip.nvim", dependencies = { "L3MON4D3/LuaSnip" } }, }, }, @@ -44,6 +42,5 @@ return { } require("telescope").load_extension "fzf" require("telescope").load_extension "lazy" - require("telescope").load_extension "noice" end, } diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua index 1493d22..4b5d626 100644 --- a/lua/plugins/toggleterm.lua +++ b/lua/plugins/toggleterm.lua @@ -1,6 +1,5 @@ return { "akinsho/toggleterm.nvim", - cond = not vim.g.vscode, version = "*", cmd = { "ToggleTerm" }, init = function() vim.keymap.set("n", "tt", "ToggleTerm") end, diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua index e4f35b7..349b74c 100644 --- a/lua/plugins/tokyonight.lua +++ b/lua/plugins/tokyonight.lua @@ -4,7 +4,7 @@ return { config = true, opts = { style = "night", - transparent = true, + transparent = not vim.g.neovide, terminal_colors = true, styles = { sidebars = "transparent", floats = "transparent" }, }, diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index b8ec9d8..4ad041a 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -1,6 +1,5 @@ return { "folke/trouble.nvim", - cond = not vim.g.vscode, dependencies = "nvim-tree/nvim-web-devicons", cmd = "TroubleToggle", init = function() vim.keymap.set("n", "xx", "TroubleToggle") end, diff --git a/lua/plugins/twilight.lua b/lua/plugins/twilight.lua index f5f6800..2b31774 100644 --- a/lua/plugins/twilight.lua +++ b/lua/plugins/twilight.lua @@ -1,6 +1,5 @@ return { "folke/twilight.nvim", - cond = not vim.g.vscode, dependencies = { "nvim-treesitter" }, cmd = "Twilight", config = true, diff --git a/lua/plugins/which_key.lua b/lua/plugins/which_key.lua index 3823288..2f0fb2d 100644 --- a/lua/plugins/which_key.lua +++ b/lua/plugins/which_key.lua @@ -1,6 +1,5 @@ return { "folke/which-key.nvim", - cond = not vim.g.vscode, keys = { "" }, init = function() vim.o.timeout = true diff --git a/lua/plugins/zen_mode.lua b/lua/plugins/zen_mode.lua index f4fe4a9..f661d66 100644 --- a/lua/plugins/zen_mode.lua +++ b/lua/plugins/zen_mode.lua @@ -1,6 +1,5 @@ return { "folke/zen-mode.nvim", - cond = not vim.g.vscode, dependencies = { "folke/twilight.nvim" }, cmd = { "ZenMode" }, init = function() vim.keymap.set("n", "z", "ZenMode") end, diff --git a/lua/ui/neovide.lua b/lua/ui/neovide.lua index 6ce4fd5..3a96106 100644 --- a/lua/ui/neovide.lua +++ b/lua/ui/neovide.lua @@ -1,5 +1,5 @@ --- vim.opt.winblend = 20 --- vim.opt.pumblend = 20 +vim.opt.winblend = 20 +vim.opt.pumblend = 20 vim.g.neovide_padding_top = 5 vim.g.neovide_padding_bottom = 5 @@ -11,3 +11,5 @@ vim.g.neovide_floating_blur_amount_y = 2.0 vim.g.neovide_hide_mouse_when_typing = false vim.g.neovide_remember_window_size = false + +vim.notify = require "notify"