Compare commits
7 Commits
9f07874772
...
9ad4462e8c
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ad4462e8c | |||
| 95a766f193 | |||
| 0bbed03377 | |||
| e8b9bfa907 | |||
| 0dcbddb8a6 | |||
| 7779261104 | |||
| 193b296118 |
2
init.lua
2
init.lua
@@ -5,9 +5,9 @@ local vanila_vim_autostart_commands = {
|
||||
"set shiftwidth=4",
|
||||
"set tabstop=4",
|
||||
"set ttyfast",
|
||||
"set clipboard=unnamedplus"
|
||||
}
|
||||
|
||||
vim.o.showcmdloc = "statusline"
|
||||
vim.diagnostic.config({
|
||||
virtual_text = true,
|
||||
signs = {
|
||||
|
||||
@@ -31,11 +31,6 @@ local kind_icons = {
|
||||
cmp.setup {
|
||||
completion = { completeopt = "menu,menuone" },
|
||||
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = {
|
||||
-- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
|
||||
@@ -72,8 +67,6 @@ cmp.setup {
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
elseif require("luasnip").expand_or_jumpable() then
|
||||
require("luasnip").expand_or_jump()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
@@ -82,8 +75,6 @@ cmp.setup {
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif require("luasnip").jumpable(-1) then
|
||||
require("luasnip").jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
@@ -92,7 +83,6 @@ cmp.setup {
|
||||
|
||||
sources = {
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
{ name = "buffer" },
|
||||
{ name = "path" },
|
||||
},
|
||||
|
||||
19
lua/config/plugins/eslint.lua
Normal file
19
lua/config/plugins/eslint.lua
Normal file
@@ -0,0 +1,19 @@
|
||||
eslint.setup({
|
||||
bin = 'eslint', -- or `eslint_d`
|
||||
code_actions = {
|
||||
enable = true,
|
||||
apply_on_save = {
|
||||
enable = true,
|
||||
types = { "directive", "problem", "suggestion", "layout" },
|
||||
},
|
||||
disable_rule_comment = {
|
||||
enable = true,
|
||||
location = "separate_line", -- or `same_line`
|
||||
},
|
||||
},
|
||||
diagnostics = {
|
||||
enable = true,
|
||||
report_unused_disable_directives = false,
|
||||
run_on = "type", -- or `save`
|
||||
},
|
||||
})
|
||||
@@ -28,30 +28,26 @@ lspconfig.eslint.setup({
|
||||
}
|
||||
})
|
||||
|
||||
vim.lsp.enable('tailwindcss')
|
||||
|
||||
lspconfig.tailwindcss.setup({})
|
||||
|
||||
lspconfig.ts_ls.setup({
|
||||
settings = {
|
||||
typescript = {
|
||||
inlayHints = {
|
||||
includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
|
||||
includeInlayParameterNameHintsWhenArgumentMatchesName = false,
|
||||
includeInlayFunctionParameterTypeHints = true,
|
||||
includeInlayVariableTypeHints = true,
|
||||
includeInlayVariableTypeHintsWhenTypeMatchesName = false,
|
||||
includeInlayPropertyDeclarationTypeHints = true,
|
||||
includeInlayFunctionLikeReturnTypeHints = true,
|
||||
includeInlayEnumMemberValueHints = true,
|
||||
},
|
||||
},
|
||||
javascript = {
|
||||
inlayHints = {
|
||||
includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
|
||||
includeInlayParameterNameHintsWhenArgumentMatchesName = false,
|
||||
includeInlayVariableTypeHints = true,
|
||||
includeInlayFunctionParameterTypeHints = true,
|
||||
includeInlayVariableTypeHintsWhenTypeMatchesName = false,
|
||||
includeInlayVariableTypeHints = true,
|
||||
includeInlayPropertyDeclarationTypeHints = true,
|
||||
includeInlayFunctionLikeReturnTypeHints = true,
|
||||
includeInlayEnumMemberValueHints = true,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ require("lualine").setup({
|
||||
source = nil, -- A function that works as a data source for diff.
|
||||
}
|
||||
},
|
||||
lualine_x = { 'encoding', 'filetype',
|
||||
lualine_x = { '%S', 'encoding', 'filetype',
|
||||
{
|
||||
'diagnostics',
|
||||
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
-- vscode format
|
||||
require("luasnip.loaders.from_vscode").lazy_load { exclude = vim.g.vscode_snippets_exclude or {} }
|
||||
require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
|
||||
|
||||
-- snipmate format
|
||||
require("luasnip.loaders.from_snipmate").load()
|
||||
require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
|
||||
|
||||
-- lua format
|
||||
require("luasnip.loaders.from_lua").load()
|
||||
require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
|
||||
|
||||
vim.api.nvim_create_autocmd("InsertLeave", {
|
||||
callback = function()
|
||||
if
|
||||
require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
|
||||
and not require("luasnip").session.jump_active
|
||||
then
|
||||
require("luasnip").unlink_current()
|
||||
end
|
||||
end,
|
||||
})
|
||||
@@ -16,12 +16,6 @@ vim.g.rustaceanvim = {
|
||||
command = "clippy",
|
||||
allFeatures = true
|
||||
},
|
||||
inlayHints = {
|
||||
lifetimeElisionHints = {
|
||||
enable = true,
|
||||
useParameterNames = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,8 +34,6 @@ map("i", "<C-s>", "<cmd>w!<cr>")
|
||||
|
||||
map("n", "<C-f>", "<C-q>")
|
||||
map("i", "<C-f>", "<C-q>")
|
||||
map("n", "<", "<cmd><gv<cr>")
|
||||
map("n", ">", "<cmd>>gv<cr>")
|
||||
|
||||
map("n", "<leader>c", function(bufnr)
|
||||
bl_utils.buf_kill("bd", bufnr, true)
|
||||
@@ -53,8 +51,11 @@ end, { desc = "Toggle DAP ui" })
|
||||
|
||||
map("n", "<A-j>", "<cmd>m .+1<CR>==")
|
||||
map("n", "<A-k>", "<cmd>m .-2<CR>==")
|
||||
map("i", "<A-j>", "<Esc><cmd>m .+1<CR>==gi")
|
||||
map("i", "<A-k>", "<Esc><cmd>m .-2<CR>==gi")
|
||||
map("i", "<A-j>", "<Esc><cmd>m .+1<CR>==gi<cr>")
|
||||
map("i", "<A-k>", "<Esc><cmd>m .-2<CR>==gi<cr>")
|
||||
|
||||
map("v", "<Tab>", ">gv")
|
||||
map("v", "<S-Tab>", "<gv")
|
||||
|
||||
map("n", "<C-Up>", "<cmd>resize -2<CR>")
|
||||
map("n", "<C-Down>", "<cmd>resize +2<CR>")
|
||||
|
||||
@@ -113,16 +113,6 @@ return {
|
||||
event = "InsertEnter",
|
||||
dependencies = {
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
dependencies = "rafamadriz/friendly-snippets",
|
||||
opts = { history = true, updateevents = "TextChanged,TextChangedI" },
|
||||
config = function(_, opts)
|
||||
require("luasnip").config.set_config(opts)
|
||||
require "config.plugins.luasnip"
|
||||
end,
|
||||
},
|
||||
{
|
||||
"saadparwaiz1/cmp_luasnip",
|
||||
"hrsh7th/cmp-nvim-lua",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/cmp-buffer",
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
return {
|
||||
{
|
||||
'Mofiqul/vscode.nvim',
|
||||
},
|
||||
{
|
||||
"kaarmu/typst.vim",
|
||||
lazy = true,
|
||||
@@ -7,6 +10,10 @@ return {
|
||||
'MunifTanjim/prettier.nvim',
|
||||
lazy = true,
|
||||
},
|
||||
{
|
||||
'MunifTanjim/eslint.nvim',
|
||||
lazy = true,
|
||||
},
|
||||
{
|
||||
'akinsho/toggleterm.nvim', version = "*", config = true
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user