Remove vim.g.vscode references, update neovide config

init.lua

@@ -63,6 +63,4 @@ vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
 -- GUI settings
 if vim.g.neovide then
     require "ui.neovide"
-elseif vim.g.vscode then
-    require "ui.vscode"
 end

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"

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" },

lua/plugins/barbecue.lua

@@ -1,6 +1,5 @@
 return {
     "utilyre/barbecue.nvim",
-    cond = not vim.g.vscode,
     name = "barbecue",
     version = "*",
     event = { "BufReadPre", "BufNewFile" },

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,

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",

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()

lua/plugins/dressing.lua

@@ -1,6 +1,5 @@
 return {
     "stevearc/dressing.nvim",
     lazy = true,
-    cond = not vim.g.vscode,
     config = true,
 }

lua/plugins/gitsigns.lua

@@ -1,6 +1,5 @@
 return {
     "lewis6991/gitsigns.nvim",
-    cond = not vim.g.vscode,
     event = { "BufReadPre", "BufNewFile" },
     config = true,
     opts = {

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,

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,

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,
+                    --     require("noice").api.status.mode.get,
-                        cond = require("noice").api.status.mode.has,
+                    --     cond = require("noice").api.status.mode.has,
-                        color = { fg = "#ff9e64" },
+                    --     color = { fg = "#ff9e64" },
-                    },
+                    -- },
                 },
                 lualine_x = { "filetype", "fileformat", "encoding" },
                 lualine_y = { "progress" },

lua/plugins/luasnip.lua

@@ -1,6 +1,5 @@
 return {
     "L3MON4D3/LuaSnip",
-    cond = not vim.g.vscode,
     lazy = true,
     dependencies = {
         "rafamadriz/friendly-snippets",

lua/plugins/neogit.lua

@@ -1,6 +1,5 @@
 return {
     "NeogitOrg/neogit",
-    cond = not vim.g.vscode,
     dependencies = {
         "nvim-lua/plenary.nvim",
         "sindrets/diffview.nvim",

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",

lua/plugins/notify.lua

@@ -1,6 +1,5 @@
 return {
     "rcarriga/nvim-notify",
-    cond = not vim.g.vscode,
     lazy = true,
     config = true,
     opts = {

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",

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",

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,

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",

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",

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()

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,

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", "<leader>no", "<cmd>SymbolsOutline <cr>") end,

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,
 }

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", "<leader>tt", "<cmd>ToggleTerm<CR>") end,

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" },
     },

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", "<leader>xx", "<cmd>TroubleToggle<cr>") end,

lua/plugins/twilight.lua

@@ -1,6 +1,5 @@
 return {
     "folke/twilight.nvim",
-    cond = not vim.g.vscode,
     dependencies = { "nvim-treesitter" },
     cmd = "Twilight",
     config = true,

lua/plugins/which_key.lua

@@ -1,6 +1,5 @@
 return {
     "folke/which-key.nvim",
-    cond = not vim.g.vscode,
     keys = { "<leader>" },
     init = function()
         vim.o.timeout = true

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", "<leader>z", "<cmd>ZenMode<CR>") end,

lua/ui/neovide.lua

@@ -1,5 +1,5 @@
--- vim.opt.winblend = 20
+vim.opt.winblend = 20
--- vim.opt.pumblend = 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"