mirror of
https://github.com/LazyVim/starter.git
synced 2026-07-22 04:21:03 +00:00
Ref: remove extra stuff, commented stuff and set lazy back to false
This commit is contained in:
parent
a584e848e0
commit
3fbf733315
5 changed files with 3 additions and 490 deletions
|
|
@ -11,15 +11,13 @@ require("lazy").setup({
|
|||
-- add LazyVim and import its plugins
|
||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||
-- import any extras modules here
|
||||
--
|
||||
-- added then proceeded to disable
|
||||
|
||||
{ import = "lazyvim.plugins.extras.lang.ruby" },
|
||||
{ import = "lazyvim.plugins.extras.lang.rust" },
|
||||
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||
{ import = "lazyvim.plugins.extras.dap.core" },
|
||||
{ import = "lazyvim.plugins.extras.test.core" },
|
||||
--
|
||||
-- { import = "lazyvim.plugins.extras.lang.typescript" },
|
||||
|
||||
-- { import = "lazyvim.plugins.extras.lang.json" },
|
||||
-- { import = "lazyvim.plugins.extras.ui.mini-animate" },
|
||||
|
||||
|
|
@ -31,7 +29,7 @@ require("lazy").setup({
|
|||
defaults = {
|
||||
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
|
||||
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
|
||||
lazy = true,
|
||||
lazy = false,
|
||||
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
|
||||
-- have outdated releases, which may break your Neovim install.
|
||||
version = false, -- always use the latest git commit
|
||||
|
|
@ -58,94 +56,3 @@ require("lazy").setup({
|
|||
},
|
||||
},
|
||||
})
|
||||
|
||||
-- ---------------------------
|
||||
-- ------- TEMPORARY -------
|
||||
-- ---------------------------
|
||||
-- -- textDocument/diagnostic support until 0.10.0 is released
|
||||
-- local _timers = {}
|
||||
-- local function setup_diagnostics(client, buffer)
|
||||
-- if require("vim.lsp.diagnostic")._enable then
|
||||
-- return
|
||||
-- end
|
||||
--
|
||||
-- local diagnostic_handler = function()
|
||||
-- local params = vim.lsp.util.make_text_document_params(buffer)
|
||||
-- client.request("textDocument/diagnostic", { textDocument = params }, function(err, result)
|
||||
-- if err then
|
||||
-- local err_msg = string.format("diagnostics error - %s", vim.inspect(err))
|
||||
-- vim.lsp.log.error(err_msg)
|
||||
-- end
|
||||
-- local diagnostic_items = {}
|
||||
-- if result then
|
||||
-- diagnostic_items = result.items
|
||||
-- end
|
||||
-- vim.lsp.diagnostic.on_publish_diagnostics(
|
||||
-- nil,
|
||||
-- vim.tbl_extend("keep", params, { diagnostics = diagnostic_items }),
|
||||
-- { client_id = client.id }
|
||||
-- )
|
||||
-- end)
|
||||
-- end
|
||||
--
|
||||
-- diagnostic_handler() -- to request diagnostics on buffer when first attaching
|
||||
--
|
||||
-- vim.api.nvim_buf_attach(buffer, false, {
|
||||
-- on_lines = function()
|
||||
-- if _timers[buffer] then
|
||||
-- vim.fn.timer_stop(_timers[buffer])
|
||||
-- end
|
||||
-- _timers[buffer] = vim.fn.timer_start(200, diagnostic_handler)
|
||||
-- end,
|
||||
-- on_detach = function()
|
||||
-- if _timers[buffer] then
|
||||
-- vim.fn.timer_stop(_timers[buffer])
|
||||
-- end
|
||||
-- end,
|
||||
-- })
|
||||
-- end
|
||||
--
|
||||
-- -- adds ShowRubyDeps command to show dependencies in the quickfix list.
|
||||
-- -- add the `all` argument to show indirect dependencies as well
|
||||
-- local function add_ruby_deps_command(client, bufnr)
|
||||
-- vim.api.nvim_buf_create_user_command(bufnr, "ShowRubyDeps", function(opts)
|
||||
-- local params = vim.lsp.util.make_text_document_params()
|
||||
-- local showAll = opts.args == "all"
|
||||
--
|
||||
-- client.request("rubyLsp/workspace/dependencies", params, function(error, result)
|
||||
-- if error then
|
||||
-- print("Error showing deps: " .. error)
|
||||
-- return
|
||||
-- end
|
||||
--
|
||||
-- local qf_list = {}
|
||||
-- for _, item in ipairs(result) do
|
||||
-- if showAll or item.dependency then
|
||||
-- table.insert(qf_list, {
|
||||
-- text = string.format("%s (%s) - %s", item.name, item.version, item.dependency),
|
||||
--
|
||||
-- filename = item.path,
|
||||
-- })
|
||||
-- end
|
||||
-- end
|
||||
--
|
||||
-- vim.fn.setqflist(qf_list)
|
||||
-- vim.cmd("copen")
|
||||
-- end, bufnr)
|
||||
-- end, {
|
||||
-- nargs = "?",
|
||||
-- complete = function()
|
||||
-- return { "all" }
|
||||
-- end,
|
||||
-- })
|
||||
-- end
|
||||
--
|
||||
-- require("lspconfig").ruby_lsp.setup({
|
||||
-- on_attach = function(client, buffer)
|
||||
-- setup_diagnostics(client, buffer)
|
||||
-- add_ruby_deps_command(client, buffer)
|
||||
-- end,
|
||||
-- })
|
||||
-- ---------------------------
|
||||
-- ------- TEMPORARY -------
|
||||
-- ---------------------------
|
||||
|
|
|
|||
|
|
@ -34,15 +34,6 @@ return {
|
|||
deactivate = function()
|
||||
require("nvim-tree.api").tree.close()
|
||||
end, -- or function() vim.cmd([[NvimTreeClose]]) end
|
||||
-- Note: Copied from LazyVim config for Neo-tree
|
||||
-- init = function()
|
||||
-- if vim.fn.argc(-1) == 1 then
|
||||
-- local stat = vim.uv.fs_stat(vim.fn.argv(0))
|
||||
-- if stat and stat.type == "directory" then
|
||||
-- require("nvim-tree")
|
||||
-- end
|
||||
-- end
|
||||
-- end,
|
||||
opts = {
|
||||
-- https://github.com/nvim-tree/nvim-tree.lua?tab=readme-ov-file#custom-mappings
|
||||
on_attach = function(bufnr)
|
||||
|
|
@ -58,15 +49,4 @@ return {
|
|||
require("nvim-tree").setup(opts)
|
||||
end,
|
||||
},
|
||||
-- {
|
||||
-- "rmagatti/goto-preview",
|
||||
-- event = "VeryLazy",
|
||||
-- opts = {
|
||||
-- default_mappings = true,
|
||||
-- resizing_mappings = true,
|
||||
-- },
|
||||
-- config = function(_, opts)
|
||||
-- require("goto-preview").setup(opts)
|
||||
-- end,
|
||||
-- },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,245 +0,0 @@
|
|||
-- since this is just an example spec, don't actually load anything here and return an empty spec
|
||||
-- stylua: ignore
|
||||
if true then return {} end
|
||||
|
||||
-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
|
||||
--
|
||||
-- In your plugin files, you can:
|
||||
-- * add extra plugins
|
||||
-- * disable/enabled LazyVim plugins
|
||||
-- * override the configuration of LazyVim plugins
|
||||
return {
|
||||
-- add gruvbox
|
||||
{ "ellisonleao/gruvbox.nvim" },
|
||||
|
||||
-- Configure LazyVim to load gruvbox
|
||||
{
|
||||
"LazyVim/LazyVim",
|
||||
opts = {
|
||||
colorscheme = "gruvbox",
|
||||
},
|
||||
},
|
||||
|
||||
-- change trouble config
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
-- opts will be merged with the parent spec
|
||||
opts = { use_diagnostic_signs = true },
|
||||
},
|
||||
|
||||
-- disable trouble
|
||||
{ "folke/trouble.nvim", enabled = false },
|
||||
|
||||
-- override nvim-cmp and add cmp-emoji
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = { "hrsh7th/cmp-emoji" },
|
||||
---@param opts cmp.ConfigSchema
|
||||
opts = function(_, opts)
|
||||
table.insert(opts.sources, { name = "emoji" })
|
||||
end,
|
||||
},
|
||||
|
||||
-- change some telescope options and a keymap to browse plugin files
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
keys = {
|
||||
-- add a keymap to browse plugin files
|
||||
-- stylua: ignore
|
||||
{
|
||||
"<leader>fp",
|
||||
function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
|
||||
desc = "Find Plugin File",
|
||||
},
|
||||
},
|
||||
-- change some options
|
||||
opts = {
|
||||
defaults = {
|
||||
layout_strategy = "horizontal",
|
||||
layout_config = { prompt_position = "top" },
|
||||
sorting_strategy = "ascending",
|
||||
winblend = 0,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- add pyright to lspconfig
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
---@class PluginLspOpts
|
||||
opts = {
|
||||
---@type lspconfig.options
|
||||
servers = {
|
||||
-- pyright will be automatically installed with mason and loaded with lspconfig
|
||||
pyright = {},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- add tsserver and setup with typescript.nvim instead of lspconfig
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"jose-elias-alvarez/typescript.nvim",
|
||||
init = function()
|
||||
require("lazyvim.util").lsp.on_attach(function(_, buffer)
|
||||
-- stylua: ignore
|
||||
vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
|
||||
vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
|
||||
end)
|
||||
end,
|
||||
},
|
||||
---@class PluginLspOpts
|
||||
opts = {
|
||||
---@type lspconfig.options
|
||||
servers = {
|
||||
-- tsserver will be automatically installed with mason and loaded with lspconfig
|
||||
tsserver = {},
|
||||
},
|
||||
-- you can do any additional lsp server setup here
|
||||
-- return true if you don't want this server to be setup with lspconfig
|
||||
---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
|
||||
setup = {
|
||||
-- example to setup with typescript.nvim
|
||||
tsserver = function(_, opts)
|
||||
require("typescript").setup({ server = opts })
|
||||
return true
|
||||
end,
|
||||
-- Specify * to use this function as a fallback for any server
|
||||
-- ["*"] = function(server, opts) end,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
|
||||
-- treesitter, mason and typescript.nvim. So instead of the above, you can use:
|
||||
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||
|
||||
-- add more treesitter parsers
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
"html",
|
||||
"javascript",
|
||||
"json",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"python",
|
||||
"query",
|
||||
"regex",
|
||||
"tsx",
|
||||
"typescript",
|
||||
"vim",
|
||||
"yaml",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
|
||||
-- would overwrite `ensure_installed` with the new value.
|
||||
-- If you'd rather extend the default config, use the code below instead:
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = function(_, opts)
|
||||
-- add tsx and treesitter
|
||||
vim.list_extend(opts.ensure_installed, {
|
||||
"tsx",
|
||||
"typescript",
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
-- the opts function can also be used to change the default opts:
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = function(_, opts)
|
||||
table.insert(opts.sections.lualine_x, "😄")
|
||||
end,
|
||||
},
|
||||
|
||||
-- or you can return new options to override all the defaults
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = function()
|
||||
return {
|
||||
--[[add your custom lualine config here]]
|
||||
}
|
||||
end,
|
||||
},
|
||||
|
||||
-- use mini.starter instead of alpha
|
||||
{ import = "lazyvim.plugins.extras.ui.mini-starter" },
|
||||
|
||||
-- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
|
||||
{ import = "lazyvim.plugins.extras.lang.json" },
|
||||
|
||||
-- add any tools you want to have installed below
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"stylua",
|
||||
"shellcheck",
|
||||
"shfmt",
|
||||
"flake8",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- Use <tab> for completion and snippets (supertab)
|
||||
-- first: disable default <tab> and <s-tab> behavior in LuaSnip
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
keys = function()
|
||||
return {}
|
||||
end,
|
||||
},
|
||||
-- then: setup supertab in cmp
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-emoji",
|
||||
},
|
||||
---@param opts cmp.ConfigSchema
|
||||
opts = function(_, opts)
|
||||
local has_words_before = function()
|
||||
unpack = unpack or table.unpack
|
||||
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
|
||||
end
|
||||
|
||||
local luasnip = require("luasnip")
|
||||
local cmp = require("cmp")
|
||||
|
||||
opts.mapping = vim.tbl_extend("force", opts.mapping, {
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
|
||||
-- this way you will only jump inside the snippet region
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
elseif has_words_before() then
|
||||
cmp.complete()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
return {
|
||||
-- {
|
||||
-- "nvim-treesitter/nvim-treesitter",
|
||||
-- opts = { ensure_installed = { "ruby" } }
|
||||
-- -- opts = function(_, opts)
|
||||
-- -- vim.list_extend(opts.ensure_installed, {
|
||||
-- -- "ruby",
|
||||
-- -- })
|
||||
-- -- end,
|
||||
-- },
|
||||
-- seems to be unnecessary??
|
||||
-- {
|
||||
-- "williamboman/mason.nvim",
|
||||
-- opts = function(_, opts)
|
||||
-- vim.list_extend(opts.ensure_installed, {
|
||||
-- "ruby-lsp",
|
||||
-- "rubocop",
|
||||
-- })
|
||||
-- end,
|
||||
-- },
|
||||
-- {
|
||||
-- "neovim/nvim-lspconfig",
|
||||
-- opts = {
|
||||
-- servers = {
|
||||
-- ruby_lsp = {
|
||||
-- filetypes = { "ruby" },
|
||||
-- },
|
||||
-- rubocop = {},
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- {
|
||||
-- "mfussenegger/nvim-dap",
|
||||
-- -- dependencies = {
|
||||
-- -- "suketa/nvim-dap-ruby",
|
||||
-- -- config = function()
|
||||
-- -- require("dap-ruby").setup()
|
||||
-- -- end,
|
||||
-- -- },
|
||||
-- keys = {
|
||||
-- -- https://github.com/mfussenegger/nvim-dap/blob/master/doc/dap.txt
|
||||
-- { "<leader>te", function() require("dap").repl.toggle() end, desc = "DAP Toggle Term" },
|
||||
-- { "<leader>tn", function() require("dap").continue() end, desc = "DAP Next/Continue" },
|
||||
-- { "<leader>tb", function() require("dap").toggle_breakpoint() end, desc = "DAP Toggle Breakpoint" },
|
||||
-- },
|
||||
-- },
|
||||
-- {
|
||||
-- "nvim-neotest/neotest",
|
||||
-- dependencies = {
|
||||
-- "olimorris/neotest-rspec",
|
||||
-- },
|
||||
-- opts = {
|
||||
-- adapters = {
|
||||
-- ["neotest-rspec"] = {
|
||||
-- -- NOTE: By default neotest-rspec uses the system wide rspec gem instead of the one through bundler
|
||||
-- -- rspec_cmd = function()
|
||||
-- -- return vim.tbl_flatten({
|
||||
-- -- "bundle",
|
||||
-- -- "exec",
|
||||
-- -- "rspec",
|
||||
-- -- })
|
||||
-- -- end,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
}
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
return {
|
||||
-- -- {
|
||||
-- -- "nvim-treesitter/nvim-treesitter",
|
||||
-- -- opts = function(_, opts)
|
||||
-- -- vim.list_extend(opts.ensure_installed, {
|
||||
-- -- "ruby",
|
||||
-- -- })
|
||||
-- -- end,
|
||||
-- -- },
|
||||
-- {
|
||||
-- "williamboman/mason.nvim",
|
||||
-- opts = function(_, opts)
|
||||
-- vim.list_extend(opts.ensure_installed, {
|
||||
-- "eslint_d",
|
||||
-- "eslint-lsp",
|
||||
-- })
|
||||
-- end,
|
||||
-- },
|
||||
-- {
|
||||
-- "neovim/nvim-lspconfig",
|
||||
-- opts = {
|
||||
-- servers = {
|
||||
-- eslint = {},
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- -- {
|
||||
-- -- "mfussenegger/nvim-dap",
|
||||
-- -- dependencies = {
|
||||
-- -- "suketa/nvim-dap-ruby",
|
||||
-- -- config = function()
|
||||
-- -- require("dap-ruby").setup()
|
||||
-- -- end,
|
||||
-- -- },
|
||||
-- -- keys = {
|
||||
-- -- -- https://github.com/mfussenegger/nvim-dap/blob/master/doc/dap.txt
|
||||
-- -- { "<leader>te", function() require("dap").repl.toggle() end, desc = "DAP Toggle Term" },
|
||||
-- -- { "<leader>tn", function() require("dap").continue() end, desc = "DAP Next/Continue" },
|
||||
-- -- { "<leader>tb", function() require("dap").toggle_breakpoint() end, desc = "DAP Toggle Breakpoint" },
|
||||
-- -- },
|
||||
-- -- },
|
||||
-- -- {
|
||||
-- -- "nvim-neotest/neotest",
|
||||
-- -- dependencies = {
|
||||
-- -- "olimorris/neotest-rspec",
|
||||
-- -- },
|
||||
-- -- opts = {
|
||||
-- -- adapters = {
|
||||
-- -- ["neotest-rspec"] = {
|
||||
-- -- -- NOTE: By default neotest-rspec uses the system wide rspec gem instead of the one through bundler
|
||||
-- -- -- rspec_cmd = function()
|
||||
-- -- -- return vim.tbl_flatten({
|
||||
-- -- -- "bundle",
|
||||
-- -- -- "exec",
|
||||
-- -- -- "rspec",
|
||||
-- -- -- })
|
||||
-- -- -- end,
|
||||
-- -- },
|
||||
-- -- },
|
||||
-- -- },
|
||||
-- -- },
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue