Remove vim.g.vscode references, update neovide config
This commit is contained in:
parent
d10b0050d4
commit
a713f7abbc
2
init.lua
2
init.lua
|
@ -63,6 +63,4 @@ vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
|
||||||
-- GUI settings
|
-- GUI settings
|
||||||
if vim.g.neovide then
|
if vim.g.neovide then
|
||||||
require "ui.neovide"
|
require "ui.neovide"
|
||||||
elseif vim.g.vscode then
|
|
||||||
require "ui.vscode"
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"goolord/alpha-nvim",
|
"goolord/alpha-nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
event = "VimEnter",
|
event = "VimEnter",
|
||||||
opts = function()
|
opts = function()
|
||||||
local dashboard = require "alpha.themes.dashboard"
|
local dashboard = require "alpha.themes.dashboard"
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"romgrk/barbar.nvim",
|
"romgrk/barbar.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
version = "^1.0.0", -- optional: only update when a new 1.x version is released
|
version = "^1.0.0", -- optional: only update when a new 1.x version is released
|
||||||
dependencies = { "lewis6991/gitsigns.nvim", "nvim-tree/nvim-web-devicons" },
|
dependencies = { "lewis6991/gitsigns.nvim", "nvim-tree/nvim-web-devicons" },
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"utilyre/barbecue.nvim",
|
"utilyre/barbecue.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
name = "barbecue",
|
name = "barbecue",
|
||||||
version = "*",
|
version = "*",
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"numToStr/Comment.nvim",
|
"numToStr/Comment.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencites = { "nvim-treesitter" },
|
dependencites = { "nvim-treesitter" },
|
||||||
keys = { "gc", "gb" },
|
keys = { "gc", "gb" },
|
||||||
config = true,
|
config = true,
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"sindrets/diffview.nvim",
|
"sindrets/diffview.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
|
dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
|
||||||
cmd = {
|
cmd = {
|
||||||
"DiffviewFileHistory",
|
"DiffviewFileHistory",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
return {
|
return {
|
||||||
"https://github.com/direnv/direnv.vim.git",
|
"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",
|
name = "direnv.vim",
|
||||||
event = { "DirChangedPre" },
|
event = { "DirChangedPre" },
|
||||||
config = function()
|
config = function()
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"stevearc/dressing.nvim",
|
"stevearc/dressing.nvim",
|
||||||
lazy = true,
|
lazy = true,
|
||||||
cond = not vim.g.vscode,
|
|
||||||
config = true,
|
config = true,
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"lewis6991/gitsigns.nvim",
|
"lewis6991/gitsigns.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
config = true,
|
config = true,
|
||||||
opts = {
|
opts = {
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = {"nvim-treesitter"},
|
dependencies = {"nvim-treesitter"},
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
config = true,
|
config = true,
|
||||||
|
|
|
@ -85,7 +85,6 @@ end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
dependencies = { "cmp-nvim-lsp", "folke/trouble.nvim", "folke/neodev.nvim", "jose-elias-alvarez/null-ls.nvim" },
|
dependencies = { "cmp-nvim-lsp", "folke/trouble.nvim", "folke/neodev.nvim", "jose-elias-alvarez/null-ls.nvim" },
|
||||||
config = config,
|
config = config,
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons", "folke/noice.nvim", "folke/tokyonight.nvim" },
|
dependencies = { "nvim-tree/nvim-web-devicons", "folke/noice.nvim", "folke/tokyonight.nvim" },
|
||||||
event = { "VeryLazy" },
|
event = { "VeryLazy" },
|
||||||
config = true,
|
config = true,
|
||||||
|
@ -25,11 +24,11 @@ return {
|
||||||
hint = " ",
|
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_x = { "filetype", "fileformat", "encoding" },
|
||||||
lualine_y = { "progress" },
|
lualine_y = { "progress" },
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"L3MON4D3/LuaSnip",
|
"L3MON4D3/LuaSnip",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
lazy = true,
|
lazy = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"rafamadriz/friendly-snippets",
|
"rafamadriz/friendly-snippets",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"NeogitOrg/neogit",
|
"NeogitOrg/neogit",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"sindrets/diffview.nvim",
|
"sindrets/diffview.nvim",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
return {
|
return {
|
||||||
"folke/noice.nvim",
|
"folke/noice.nvim",
|
||||||
cond = not vim.g.vscode,
|
cond = not vim.g.neovide,
|
||||||
event = { "VeryLazy" },
|
event = { "VeryLazy" },
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"rcarriga/nvim-notify",
|
"rcarriga/nvim-notify",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
lazy = true,
|
lazy = true,
|
||||||
config = true,
|
config = true,
|
||||||
opts = {
|
opts = {
|
||||||
|
|
|
@ -44,7 +44,6 @@ end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
event = "InsertEnter",
|
event = "InsertEnter",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"SmiteshP/nvim-navbuddy",
|
"SmiteshP/nvim-navbuddy",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"SmiteshP/nvim-navic",
|
"SmiteshP/nvim-navic",
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"SmiteshP/nvim-navic",
|
"SmiteshP/nvim-navic",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = "neovim/nvim-lspconfig",
|
dependencies = "neovim/nvim-lspconfig",
|
||||||
lazy = true,
|
lazy = true,
|
||||||
config = true,
|
config = true,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
return {
|
return {
|
||||||
"nvim-neorg/neorg",
|
"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",
|
build = ":Neorg sync-parsers",
|
||||||
ft = "norg",
|
ft = "norg",
|
||||||
cmd = "Neorg",
|
cmd = "Neorg",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"nvim-neotest/neotest",
|
"nvim-neotest/neotest",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
lazy = true,
|
lazy = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"stevearc/oil.nvim",
|
"stevearc/oil.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
cmd = "Oil",
|
cmd = "Oil",
|
||||||
init = function()
|
init = function()
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"ahmedkhalf/project.nvim",
|
"ahmedkhalf/project.nvim",
|
||||||
cond = not vim.g.neovide and not vim.g.vscode,
|
|
||||||
name = "project_nvim",
|
name = "project_nvim",
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
config = true,
|
config = true,
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"simrat39/symbols-outline.nvim",
|
"simrat39/symbols-outline.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
cmd = "SymbolsOutline",
|
cmd = "SymbolsOutline",
|
||||||
dependencies = { "neovim/nvim-lspconfig" },
|
dependencies = { "neovim/nvim-lspconfig" },
|
||||||
init = function() vim.keymap.set("n", "<leader>no", "<cmd>SymbolsOutline <cr>") end,
|
init = function() vim.keymap.set("n", "<leader>no", "<cmd>SymbolsOutline <cr>") end,
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
return {
|
return {
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
branch = "0.1.x",
|
branch = "0.1.x",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{
|
{
|
||||||
{ "nvim-lua/plenary.nvim" },
|
{ "nvim-lua/plenary.nvim" },
|
||||||
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
|
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
|
||||||
{ "tsakirist/telescope-lazy.nvim", dependencies = { "folke/lazy.nvim" } },
|
{ "tsakirist/telescope-lazy.nvim", dependencies = { "folke/lazy.nvim" } },
|
||||||
{ "folke/noice.nvim" },
|
|
||||||
{ "benfowler/telescope-luasnip.nvim", dependencies = { "L3MON4D3/LuaSnip" } },
|
{ "benfowler/telescope-luasnip.nvim", dependencies = { "L3MON4D3/LuaSnip" } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -44,6 +42,5 @@ return {
|
||||||
}
|
}
|
||||||
require("telescope").load_extension "fzf"
|
require("telescope").load_extension "fzf"
|
||||||
require("telescope").load_extension "lazy"
|
require("telescope").load_extension "lazy"
|
||||||
require("telescope").load_extension "noice"
|
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"akinsho/toggleterm.nvim",
|
"akinsho/toggleterm.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
version = "*",
|
version = "*",
|
||||||
cmd = { "ToggleTerm" },
|
cmd = { "ToggleTerm" },
|
||||||
init = function() vim.keymap.set("n", "<leader>tt", "<cmd>ToggleTerm<CR>") end,
|
init = function() vim.keymap.set("n", "<leader>tt", "<cmd>ToggleTerm<CR>") end,
|
||||||
|
|
|
@ -4,7 +4,7 @@ return {
|
||||||
config = true,
|
config = true,
|
||||||
opts = {
|
opts = {
|
||||||
style = "night",
|
style = "night",
|
||||||
transparent = true,
|
transparent = not vim.g.neovide,
|
||||||
terminal_colors = true,
|
terminal_colors = true,
|
||||||
styles = { sidebars = "transparent", floats = "transparent" },
|
styles = { sidebars = "transparent", floats = "transparent" },
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"folke/trouble.nvim",
|
"folke/trouble.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = "nvim-tree/nvim-web-devicons",
|
dependencies = "nvim-tree/nvim-web-devicons",
|
||||||
cmd = "TroubleToggle",
|
cmd = "TroubleToggle",
|
||||||
init = function() vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>") end,
|
init = function() vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>") end,
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"folke/twilight.nvim",
|
"folke/twilight.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = { "nvim-treesitter" },
|
dependencies = { "nvim-treesitter" },
|
||||||
cmd = "Twilight",
|
cmd = "Twilight",
|
||||||
config = true,
|
config = true,
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"folke/which-key.nvim",
|
"folke/which-key.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
keys = { "<leader>" },
|
keys = { "<leader>" },
|
||||||
init = function()
|
init = function()
|
||||||
vim.o.timeout = true
|
vim.o.timeout = true
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
return {
|
return {
|
||||||
"folke/zen-mode.nvim",
|
"folke/zen-mode.nvim",
|
||||||
cond = not vim.g.vscode,
|
|
||||||
dependencies = { "folke/twilight.nvim" },
|
dependencies = { "folke/twilight.nvim" },
|
||||||
cmd = { "ZenMode" },
|
cmd = { "ZenMode" },
|
||||||
init = function() vim.keymap.set("n", "<leader>z", "<cmd>ZenMode<CR>") end,
|
init = function() vim.keymap.set("n", "<leader>z", "<cmd>ZenMode<CR>") end,
|
||||||
|
|
|
@ -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_top = 5
|
||||||
vim.g.neovide_padding_bottom = 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_hide_mouse_when_typing = false
|
||||||
vim.g.neovide_remember_window_size = false
|
vim.g.neovide_remember_window_size = false
|
||||||
|
|
||||||
|
vim.notify = require "notify"
|
||||||
|
|
Loading…
Reference in a new issue