feat(vscode): drop compatibility with vscode-nvim

ruicsh · ruicsh · commit 219fca6de4d1 · 2025-07-20T19:39:09.000+01:00
diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua
@@ -113,6 +113,5 @@ return {
 	},
 
 	event = { "InsertEnter", "CmdlineEnter" },
-	enabled = not vim.g.vscode,
 	version = "1.*",
 }
diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
@@ -38,5 +38,4 @@ return {
 	end,
 
 	event = { "BufWritePre" },
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/copilot-chat.lua b/lua/plugins/copilot-chat.lua
@@ -950,7 +950,6 @@ return {
 		})
 	end,
 
-	enabled = not vim.g.vscode,
 	dependencies = {
 		{ "zbirenbaum/copilot.lua" },
 		{ "nvim-lua/plenary.nvim" },
diff --git a/lua/plugins/copilot.lua b/lua/plugins/copilot.lua
@@ -42,5 +42,4 @@ return {
 
 	cmd = "Copilot",
 	event = "InsertEnter",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua
@@ -65,7 +65,6 @@ return {
 		end
 	end,
 
-	enabled = not vim.g.vscode,
 	dependencies = {
 		{
 			"igorlfs/nvim-dap-view",
diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua
@@ -27,5 +27,4 @@ return {
 	end,
 
 	event = "VeryLazy",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/lazydev.lua b/lua/plugins/lazydev.lua
@@ -11,5 +11,4 @@ return {
 
 	lazy = true,
 	ft = "lua",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
@@ -144,5 +144,4 @@ return {
 	end,
 
 	event = { "VeryLazy" },
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/mini.clue.lua b/lua/plugins/mini.clue.lua
@@ -56,5 +56,4 @@ return {
 	end,
 
 	event = "VeryLazy",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/mini.diff.lua b/lua/plugins/mini.diff.lua
@@ -35,5 +35,4 @@ return {
 	},
 
 	event = "BufRead",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/mini.hipatterns.lua b/lua/plugins/mini.hipatterns.lua
@@ -35,5 +35,4 @@ return {
 	end,
 
 	event = "BufRead",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/mini.notify.lua b/lua/plugins/mini.notify.lua
@@ -24,5 +24,4 @@ return {
 	},
 
 	event = { "VeryLazy" },
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
@@ -58,7 +58,6 @@ return {
 			signcolumn = "yes:2",
 		},
 	},
-	enabled = not vim.g.vscode,
 	dependencies = {
 		{ "nvim-tree/nvim-web-devicons" },
 	},
diff --git a/lua/plugins/snacks.bufdelete.lua b/lua/plugins/snacks.bufdelete.lua
@@ -35,5 +35,4 @@ return {
 	},
 
 	event = "VeryLazy",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/snacks.gitbrowse.lua b/lua/plugins/snacks.gitbrowse.lua
@@ -27,5 +27,4 @@ return {
 	},
 
 	event = "BufRead",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/snacks.indent.lua b/lua/plugins/snacks.indent.lua
@@ -15,5 +15,4 @@ return {
 	},
 
 	event = "BufRead",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/snacks.picker.lua b/lua/plugins/snacks.picker.lua
@@ -287,7 +287,6 @@ return {
 	},
 
 	lazy = false,
-	enabled = not vim.g.vscode,
 	dependencies = {
 		{ "nvim-lua/plenary.nvim" },
 	},
diff --git a/lua/plugins/snacks.statuscolumn.lua b/lua/plugins/snacks.statuscolumn.lua
@@ -11,5 +11,4 @@ return {
 	},
 
 	event = "BufRead",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/treewalker.lua b/lua/plugins/treewalker.lua
@@ -23,6 +23,4 @@ return {
 		highlight = true,
 		jumplist = false,
 	},
-
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/ts-comments.lua b/lua/plugins/ts-comments.lua
@@ -17,5 +17,4 @@ return {
 	},
 
 	event = "BufRead",
-	enabled = not vim.g.vscode,
 }
diff --git a/lua/plugins/vim-test.lua b/lua/plugins/vim-test.lua
@@ -38,5 +38,4 @@ return {
 	end,
 
 	cmd = { "TestLast", "TestNearest", "TestFile", "TestSuite" },
-	enabled = not vim.g.vscode,
 }
diff --git a/plugin/autocmds/lsp-attach.lua b/plugin/autocmds/lsp-attach.lua
@@ -139,10 +139,6 @@ vim.api.nvim_create_autocmd("LspAttach", {
 	group = augroup,
 	pattern = "*",
 	callback = function(event)
-		if vim.g.vscode then
-			return
-		end
-
 		local bufnr = event.buf
 		local client = vim.lsp.get_client_by_id(event.data.client_id)
 		if not client then
@@ -163,10 +159,6 @@ vim.api.nvim_create_autocmd("LspAttach", {
 vim.api.nvim_create_autocmd("LspDetach", {
 	group = augroup,
 	callback = function(event)
-		if vim.g.vscode then
-			return
-		end
-
 		local bufnr = event.buf
 		local client = vim.lsp.get_client_by_id(event.data.client_id)
 		if not client then
diff --git a/plugin/autocmds/vim-enter.lua b/plugin/autocmds/vim-enter.lua
@@ -6,11 +6,6 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
 		-- Load env vars from config
 		vim.cmd("LoadEnvVars")
 
-		-- No need to run this if running in vscode
-		if vim.g.vscode then
-			return
-		end
-
 		-- If vim was opened with files, don't open changed files
 		if #vim.fn.argv() > 0 then
 			return
diff --git a/plugin/config/statusline.lua b/plugin/config/statusline.lua
@@ -94,11 +94,7 @@ local function c_project()
 		return ""
 	end
 
-	if vim.g.vscode then
-		line = line .. project_name .. ": "
-	else
-		line = line .. " " .. project_name
-	end
+	line = line .. " " .. project_name
 
 	return line
 end
@@ -287,12 +283,6 @@ end
 
 -- Construct the statusline (default)
 function _G.status_line()
-	if vim.g.vscode then
-		return table.concat({
-			c_mode(),
-		})
-	end
-
 	local hl = "%#StatusLine#"
 
 	local components = {
diff --git a/plugin/custom/on-search.lua b/plugin/custom/on-search.lua
@@ -5,10 +5,6 @@
 -- 2. Search count indicator
 -- https://github.com/chrisgrieser/.config/blob/main/nvim/lua/config/autocmds.lua
 
-if vim.g.vscode then
-	return
-end
-
 local ns = vim.api.nvim_create_namespace("ruicsh/custom/on-search")
 local ns_count = vim.api.nvim_create_namespace("ruicsh/custom/on-search/count")
 
diff --git a/plugin/filetypes/python.lua b/plugin/filetypes/python.lua
@@ -148,10 +148,6 @@ vim.api.nvim_create_autocmd("FileType", {
 	group = augroup,
 	pattern = "python",
 	callback = function()
-		if vim.g.vscode then
-			return
-		end
-
 		-- Only run once per session
 		if vim.g.venv_configured then
 			return
diff --git a/plugin/filetypes/rust.lua b/plugin/filetypes/rust.lua
@@ -74,8 +74,6 @@ vim.api.nvim_create_autocmd("FileType", {
 	group = augroup,
 	pattern = "rust",
 	callback = function()
-		if not vim.g.vscode then
-			setup_dap()
-		end
+		setup_dap()
 	end,
 })
diff --git a/plugin/filetypes/typescript.lua b/plugin/filetypes/typescript.lua
@@ -53,8 +53,6 @@ vim.api.nvim_create_autocmd("FileType", {
 	group = augroup,
 	pattern = { "typescript", "typescriptreact", "typescript.tsx" },
 	callback = function()
-		if not vim.g.vscode then
-			setup_dap()
-		end
+		setup_dap()
 	end,
 })
diff --git a/plugin/gui.lua b/plugin/gui.lua
@@ -1,9 +1,3 @@
--- VSCode
-if vim.g.vscode then
-	-- https://stackoverflow.com/questions/78611905/turn-off-neovim-messages-in-vscode
-	vim.opt.cmdheight = 1
-end
-
 -- Windows
 local OS = vim.uv.os_uname().sysname
 if OS:find("Windows") then
@@ -21,16 +15,3 @@ if OS:find("Windows") then
 		vim.opt[option] = value
 	end
 end
-
--- Neovide
-if vim.g.neovide then
-	vim.opt.guifont = "JetBrainsMono Nerd Font:h12" -- Font family and size.
-	-- Turn off all animations.
-	vim.g.neovide_cursor_animate_command_line = false
-	vim.g.neovide_cursor_animate_in_insert_mode = false
-	vim.g.neovide_cursor_animation_length = 0.00
-	vim.g.neovide_cursor_trail_size = 0
-	vim.g.neovide_position_animation_length = 0
-	vim.g.neovide_scroll_animation_far_lines = 0
-	vim.g.neovide_scroll_animation_length = 0.00
-end
diff --git a/plugin/keymaps/normal.lua b/plugin/keymaps/normal.lua
@@ -123,11 +123,6 @@ end
 
 -- }}}
 
--- Stop setting keymaps incompatible with vscode
-if vim.g.vscode then
-	return
-end
-
 -- Buffers {{{
 k("<bs>", "<c-6>", { desc = "Toggle to last buffer" }) -- `:h CTRL-6`
 -- }}}
diff --git a/plugin/keymaps/vscode.lua b/plugin/keymaps/vscode.lua
diff --git a/readme.md b/readme.md
@@ -12,7 +12,7 @@ My configuration for [Neovim](https://neovim.io/), mostly for frontend developme
 - **Search** - fuzzy find anything, file, workspace scoped search and replace
 - **UI** - files and directory explorer, notifications, command palette, bookmarks
 
-<sub>Works on Neovim v0.11.1 (and vscode-neovim)</sub>
+<sub>Works on Neovim v0.11.3</sub>
 
 ## Screenshots
 

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,5 @@ return {`
`113`	`113`	`},`
`114`	`114`
`115`	`115`	`event = { "InsertEnter", "CmdlineEnter" },`
`116`		`- enabled = not vim.g.vscode,`
`117`	`116`	`version = "1.*",`
`118`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,4 @@ return {`
`38`	`38`	`end,`
`39`	`39`
`40`	`40`	`event = { "BufWritePre" },`
`41`		`- enabled = not vim.g.vscode,`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,4 @@ return {`
`42`	`42`
`43`	`43`	`cmd = "Copilot",`
`44`	`44`	`event = "InsertEnter",`
`45`		`- enabled = not vim.g.vscode,`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ return {`
`65`	`65`	`end`
`66`	`66`	`end,`
`67`	`67`
`68`		`- enabled = not vim.g.vscode,`
`69`	`68`	`dependencies = {`
`70`	`69`	`{`
`71`	`70`	`"igorlfs/nvim-dap-view",`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,4 @@ return {`
`27`	`27`	`end,`
`28`	`28`
`29`	`29`	`event = "VeryLazy",`
`30`		`- enabled = not vim.g.vscode,`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,4 @@ return {`
`11`	`11`
`12`	`12`	`lazy = true,`
`13`	`13`	`ft = "lua",`
`14`		`- enabled = not vim.g.vscode,`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,5 +144,4 @@ return {`
`144`	`144`	`end,`
`145`	`145`
`146`	`146`	`event = { "VeryLazy" },`
`147`		`- enabled = not vim.g.vscode,`
`148`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,4 @@ return {`
`56`	`56`	`end,`
`57`	`57`
`58`	`58`	`event = "VeryLazy",`
`59`		`- enabled = not vim.g.vscode,`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,4 @@ return {`
`35`	`35`	`},`
`36`	`36`
`37`	`37`	`event = "BufRead",`
`38`		`- enabled = not vim.g.vscode,`
`39`	`38`	`}`