suimeng
/
starter
mirror of https://github.com/LazyVim/starter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TMP: remove stoopid errors

pull/102/head
Jules Sang 2024-11-20 10:02:10 +01:00
parent 0aa25db718
commit 4ab408aea0
5 changed files with 164 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lazyvim.json
View File

@ -1,8 +1,10 @@
{ {
"extras": [ "extras.bak": [
"lazyvim.plugins.extras.coding.codeium",
"lazyvim.plugins.extras.editor.leap" "lazyvim.plugins.extras.editor.leap"
], ],
"extras": [
"lazyvim.plugins.extras.coding.codeium"
],
"news": { "news": {
"NEWS.md": "2123" "NEWS.md": "2123"
}, },

5
lua/config/lazy.lua
View File

@ -2,7 +2,8 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then if not vim.loop.fs_stat(lazypath) then
-- bootstrap lazy.nvim -- bootstrap lazy.nvim
-- stylua: ignore -- stylua: ignore
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable",
lazypath })
end end
vim.opt.rtp:prepend(vim.env.LAZY or lazypath) vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
@ -15,7 +16,7 @@ require("lazy").setup({
-- import any extras modules here -- import any extras modules here
{ import = "lazyvim.plugins.extras.lang.typescript" }, { import = "lazyvim.plugins.extras.lang.typescript" },
{ import = "lazyvim.plugins.extras.lang.json" }, { import = "lazyvim.plugins.extras.lang.json" },
{ import = "lazyvim.plugins.extras.lang.tailwind" }, -- { import = "lazyvim.plugins.extras.lang.tailwind" },
{ import = "lazyvim.plugins.extras.lsp.none-ls" }, { import = "lazyvim.plugins.extras.lsp.none-ls" },
-- { import = "lazyvim.plugins.extras.ui.mini-animate" }, -- { import = "lazyvim.plugins.extras.ui.mini-animate" },
-- import/override with your plugins -- import/override with your plugins

39
lua/plugins/harpoon.lua
View File

@ -1,19 +1,22 @@
return { return {}
"ThePrimeagen/harpoon",
config = function()
local ui = require("harpoon.ui")
require("harpoon").setup({ --
menu = { -- return {
width = vim.api.nvim_win_get_width(0) - 24, -- "ThePrimeagen/harpoon",
}, -- config = function()
global_settings = { -- local ui = require("harpoon.ui")
mark_branch = true, --
}, -- require("harpoon").setup({
}) -- menu = {
-- width = vim.api.nvim_win_get_width(0) - 24,
vim.keymap.set("n", "<C-c>", function() -- },
ui.nav_next() -- global_settings = {
end, { desc = "Navigate next" }) -- mark_branch = true,
end, -- },
} -- })
--
-- vim.keymap.set("n", "<C-c>", function()
-- ui.nav_next()
-- end, { desc = "Navigate next" })
-- end,
-- }

119
lua/plugins/lsp-config.lua
View File

@ -27,7 +27,6 @@ return {
"typescriptreact", "typescriptreact",
"typescript.tsx", "typescript.tsx",
}, },
root_dir = util.root_pattern("tsconfig.json", "jsconfig.json", "package.json", ".git"),
settings = { settings = {
complete_function_calls = true, complete_function_calls = true,
vtsls = { vtsls = {
@ -53,58 +52,58 @@ return {
variableTypes = { enabled = false }, variableTypes = { enabled = false },
}, },
}, },
keys = { -- keys = {
{ -- {
"gD", -- "gD",
function() -- function()
local params = vim.lsp.util.make_position_params() -- local params = vim.lsp.util.make_position_params()
LazyVim.lsp.execute({ -- LazyVim.lsp.execute({
command = "typescript.goToSourceDefinition", -- command = "typescript.goToSourceDefinition",
arguments = { params.textDocument.uri, params.position }, -- arguments = { params.textDocument.uri, params.position },
open = true, -- open = true,
}) -- })
end, -- end,
desc = "Goto Source Definition", -- desc = "Goto Source Definition",
}, -- },
{ -- {
"gR", -- "gR",
function() -- function()
LazyVim.lsp.execute({ -- LazyVim.lsp.execute({
command = "typescript.findAllFileReferences", -- command = "typescript.findAllFileReferences",
arguments = { vim.uri_from_bufnr(0) }, -- arguments = { vim.uri_from_bufnr(0) },
open = true, -- open = true,
}) -- })
end, -- end,
desc = "File References", -- desc = "File References",
}, -- },
{ -- {
"<leader>co", -- "<leader>co",
LazyVim.lsp.action["source.organizeImports"], -- LazyVim.lsp.action["source.organizeImports"],
desc = "Organize Imports", -- desc = "Organize Imports",
}, -- },
{ -- {
"<leader>cM", -- "<leader>cM",
LazyVim.lsp.action["source.addMissingImports.ts"], -- LazyVim.lsp.action["source.addMissingImports.ts"],
desc = "Add missing imports", -- desc = "Add missing imports",
}, -- },
{ -- {
"<leader>cu", -- "<leader>cu",
LazyVim.lsp.action["source.removeUnused.ts"], -- LazyVim.lsp.action["source.removeUnused.ts"],
desc = "Remove unused imports", -- desc = "Remove unused imports",
}, -- },
{ -- {
"<leader>cD", -- "<leader>cD",
LazyVim.lsp.action["source.fixAll.ts"], -- LazyVim.lsp.action["source.fixAll.ts"],
desc = "Fix all diagnostics", -- desc = "Fix all diagnostics",
}, -- },
{ -- {
"<leader>cV", -- "<leader>cV",
function() -- function()
LazyVim.lsp.execute({ command = "typescript.selectTypeScriptVersion" }) -- LazyVim.lsp.execute({ command = "typescript.selectTypeScriptVersion" })
end, -- end,
desc = "Select TS workspace version", -- desc = "Select TS workspace version",
}, -- },
}, -- },
}, },
}, },
marksman = {}, marksman = {},
@ -220,13 +219,13 @@ return {
vim.tbl_deep_extend("force", {}, opts.settings.typescript, opts.settings.javascript or {}) vim.tbl_deep_extend("force", {}, opts.settings.typescript, opts.settings.javascript or {})
end, end,
tailwindcss = function(_, opts) -- tailwindcss = function(_, opts)
local tw = require("lspconfig.server_configurations.tailwindcss") -- local tw = require("lspconfig.server_configurations.tailwindcss")
--- @param ft string -- --- @param ft string
opts.filetypes = vim.tbl_filter(function(ft) -- opts.filetypes = vim.tbl_filter(function(ft)
return not vim.tbl_contains(opts.filetypes_exclude or {}, ft) -- return not vim.tbl_contains(opts.filetypes_exclude or {}, ft)
end, tw.default_config.filetypes) -- end, tw.default_config.filetypes)
end, -- end,
}, },
}, },
} }

358
lua/plugins/which-key.lua
View File

@ -2,9 +2,9 @@ return {
"folke/which-key.nvim", "folke/which-key.nvim",
config = function() config = function()
local wk = require("which-key") local wk = require("which-key")
local mark = require("harpoon.mark") -- local mark = require("harpoon.mark")
local ui = require("harpoon.ui") -- local ui = require("harpoon.ui")
local term = require("harpoon.term") -- local term = require("harpoon.term")
local newMappings = { local newMappings = {
mode = { "n", "v" }, mode = { "n", "v" },
@ -29,79 +29,79 @@ return {
end, end,
desc = "Close buffer", desc = "Close buffer",
}, },
{ "<leader>h", group = "Harpoon" }, -- { "<leader>h", group = "Harpoon" },
{ "<leader>ha", mark.add_file, desc = "Add file" }, -- { "<leader>ha", mark.add_file, desc = "Add file" },
{ "<leader>hh", ui.toggle_quick_menu, desc = "Toggle quick menu" }, -- { "<leader>hh", ui.toggle_quick_menu, desc = "Toggle quick menu" },
{ -- {
"<leader>hn", -- "<leader>hn",
function() -- function()
ui.nav_next() -- ui.nav_next()
end, -- end,
desc = "Navigate next", -- desc = "Navigate next",
}, -- },
{ -- {
"<leader>hp", -- "<leader>hp",
function() -- function()
ui.nav_prev() -- ui.nav_prev()
end, -- end,
desc = "Navigate previous", -- desc = "Navigate previous",
}, -- },
{ -- {
"<leader>h1", -- "<leader>h1",
function() -- function()
ui.nav_file(1) -- ui.nav_file(1)
end, -- end,
desc = "Navigate 1", -- desc = "Navigate 1",
}, -- },
{ -- {
"<leader>h2", -- "<leader>h2",
function() -- function()
ui.nav_file(2) -- ui.nav_file(2)
end, -- end,
desc = "Navigate 2", -- desc = "Navigate 2",
}, -- },
{ -- {
"<leader>h3", -- "<leader>h3",
function() -- function()
ui.nav_file(3) -- ui.nav_file(3)
end, -- end,
desc = "Navigate 3", -- desc = "Navigate 3",
}, -- },
{ -- {
"<leader>h4", -- "<leader>h4",
function() -- function()
ui.nav_file(4) -- ui.nav_file(4)
end, -- end,
desc = "Navigate 4", -- desc = "Navigate 4",
}, -- },
{ -- {
"<leader>h&", -- "<leader>h&",
function() -- function()
ui.nav_file(1) -- ui.nav_file(1)
end, -- end,
desc = "Navigate 1", -- desc = "Navigate 1",
}, -- },
{ -- {
"<leader>hé", -- "<leader>hé",
function() -- function()
ui.nav_file(2) -- ui.nav_file(2)
end, -- end,
desc = "Navigate 2", -- desc = "Navigate 2",
}, -- },
{ -- {
'<leader>h"', -- '<leader>h"',
function() -- function()
ui.nav_file(3) -- ui.nav_file(3)
end, -- end,
desc = "Navigate 3", -- desc = "Navigate 3",
}, -- },
{ -- {
"<leader>h'", -- "<leader>h'",
function() -- function()
ui.nav_file(4) -- ui.nav_file(4)
end, -- end,
desc = "Navigate 4", -- desc = "Navigate 4",
}, -- },
{ "<leader>c", group = "Language" }, { "<leader>c", group = "Language" },
{ {
"<leader>cr", "<leader>cr",
@ -113,212 +113,6 @@ return {
}, },
} }
local mappingsz = {
w = {
h = { "<cmd>:wincmd h<cr>", "Jump left" },
j = { "<cmd>:wincmd j<cr>", "Jump bottom" },
k = { "<cmd>:wincmd k<cr>", "Jump up" },
l = { "<cmd>:wincmd l<cr>", "Jump right" },
},
t = {
t = { "<cmd>Neotree toggle<cr>", "Toggle" },
},
b = {
name = "Buffer",
n = { "<cmd>BufferLineCycleNext<cr>", "Next" },
l = { "<cmd>BufferLineCyclePrev<cr>", "Next" },
L = { "<cmd>BufferLineMoveNext<cr>", "Next" },
h = { "<cmd>BufferLineCyclePrev<cr>", "Previous" },
H = { "<cmd>BufferLineMovePrev<cr>", "Previous" },
p = { "<cmd>BufferLinePick<cr>", "Pick buffer" },
q = {
function()
require("mini.bufremove").delete(0, false)
end,
"Close",
},
d = { "<cmd><cr>", "which_key_ignore" },
},
h = {
name = "Harpoon",
a = { mark.add_file, "Add file" },
h = { ui.toggle_quick_menu, "Toggle quick menu" },
n = {
function()
ui.nav_next()
end,
"Navigate next",
},
p = {
function()
ui.nav_prev()
end,
"Navigate previous",
},
["1"] = {
function()
ui.nav_file(1)
end,
"Navigate 1",
},
["2"] = {
function()
ui.nav_file(2)
end,
"Navigate 2",
},
["3"] = {
function()
ui.nav_file(3)
end,
"Navigate 3",
},
["4"] = {
function()
ui.nav_file(4)
end,
"Navigate 4",
},
["&"] = {
function()
ui.nav_file(1)
end,
"Navigate 1",
},
["é"] = {
function()
ui.nav_file(2)
end,
"Navigate 2",
},
['"'] = {
function()
ui.nav_file(3)
end,
"Navigate 3",
},
["'"] = {
function()
ui.nav_file(4)
end,
"Navigate 4",
},
},
c = {
name = "Language",
r = {
function()
vim.cmd([[Telescope lsp_references]])
end,
"Find references",
remap = true,
},
},
}
local mappings = {
w = {
h = { "<cmd>:wincmd h<cr>", "Jump left" },
j = { "<cmd>:wincmd j<cr>", "Jump bottom" },
k = { "<cmd>:wincmd k<cr>", "Jump up" },
l = { "<cmd>:wincmd l<cr>", "Jump right" },
},
t = {
t = { "<cmd>Neotree toggle<cr>", "Toggle" },
},
b = {
name = "Buffer",
n = { "<cmd>BufferLineCycleNext<cr>", "Next" },
l = { "<cmd>BufferLineCyclePrev<cr>", "Next" },
L = { "<cmd>BufferLineMoveNext<cr>", "Next" },
h = { "<cmd>BufferLineCyclePrev<cr>", "Previous" },
H = { "<cmd>BufferLineMovePrev<cr>", "Previous" },
p = { "<cmd>BufferLinePick<cr>", "Pick buffer" },
q = {
function()
require("mini.bufremove").delete(0, false)
end,
"Close",
},
d = { "<cmd><cr>", "which_key_ignore" },
},
h = {
name = "Harpoon",
a = { mark.add_file, "Add file" },
h = { ui.toggle_quick_menu, "Toggle quick menu" },
n = {
function()
ui.nav_next()
end,
"Navigate next",
},
p = {
function()
ui.nav_prev()
end,
"Navigate previous",
},
["1"] = {
function()
ui.nav_file(1)
end,
"Navigate 1",
},
["2"] = {
function()
ui.nav_file(2)
end,
"Navigate 2",
},
["3"] = {
function()
ui.nav_file(3)
end,
"Navigate 3",
},
["4"] = {
function()
ui.nav_file(4)
end,
"Navigate 4",
},
["&"] = {
function()
ui.nav_file(1)
end,
"Navigate 1",
},
["é"] = {
function()
ui.nav_file(2)
end,
"Navigate 2",
},
['"'] = {
function()
ui.nav_file(3)
end,
"Navigate 3",
},
["'"] = {
function()
ui.nav_file(4)
end,
"Navigate 4",
},
},
c = {
name = "Language",
r = {
function()
vim.cmd([[Telescope lsp_references]])
end,
"Find references",
remap = true,
},
},
}
wk.add(newMappings) wk.add(newMappings)
-- wk.add(mappings, { mode = "n", prefix = "<leader>" }) -- wk.add(mappings, { mode = "n", prefix = "<leader>" })