Compare commits

...

14 Commits

14 changed files with 151 additions and 72 deletions

View File

@@ -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 = {
@@ -38,13 +38,17 @@ require("config.plugins.buffer")
require("config.plugins.colorizer")
require("config.plugins.comment")
require("config.plugins.dap")
require("config.plugins.dropbar")
require("config.plugins.gitsigns")
require("config.plugins.ibl")
require("config.plugins.hover_actions")
require("config.plugins.lsp_config")
require("config.plugins.lualine")
require("config.plugins.noice")
require("toggleterm").setup()
require("config.plugins.navic")
require("toggleterm").setup({
direction = "float",
})
require("config.plugins.telescope")
require("config.plugins.treesitter")
require("config.plugins.neotree")
@@ -52,6 +56,9 @@ require("config.plugins.prettier")
require("config.plugins.rustaceanvim")
require("huez").setup({})
vim.api.nvim_set_hl(0, 'WinBar', { link = 'BufferLineCloseButtonSelected' })
vim.api.nvim_set_hl(0, 'WinBarNC', { link = "BufferLineCloseButtonSelected" })
vim.api.nvim_create_autocmd("BufWritePre", {
buffer = buffer,
callback = function()

View File

@@ -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" },
},

View File

@@ -1,7 +1,7 @@
local dap = require('dap')
require("dap-vscode-js").setup({
debugger_path = "/.local/share/lunarvim/site/pack/lazy/opt/vscode-js-debug",
debugger_path = "/.local/share/nvim/site/pack/lazy/opt/vscode-js-debug",
debugger_cmd = { "js-debug-adapter" },
adapters = { 'node-terminal' },
})
@@ -28,7 +28,7 @@ dap.adapters["pwa-node"] = {
port = "${port}",
executable = {
command = "node",
args = { os.getenv("HOME") .. "/.local/share/lvim/mason/packages/js-debug-adapter/js-debug/src/dapDebugServer.js", "${port}" },
args = { os.getenv("HOME") .. "/.local/share/nvim/mason/packages/js-debug-adapter/js-debug/src/dapDebugServer.js", "${port}" },
}
}
@@ -45,13 +45,13 @@ dap.configurations.javascript = {
dap.adapters.chrome = {
type = "executable",
command = "node",
args = { os.getenv("HOME") .. "/.local/share/lvim/mason/packages/chrome-debug-adapter/out/src/chromeDebug.js" },
args = { os.getenv("HOME") .. "/.local/share/nvim/mason/packages/chrome-debug-adapter/out/src/chromeDebug.js" },
}
dap.adapters.firefox = {
type = 'executable',
command = 'node',
args = { os.getenv('HOME') .. '/.local/share/lvim/mason/packages/firefox-debug-adapter/dist/adapter.bundle.js' },
args = { os.getenv('HOME') .. '/.local/share/nvim/mason/packages/firefox-debug-adapter/dist/adapter.bundle.js' },
}
dap.configurations.typescriptreact = {
@@ -75,7 +75,7 @@ dap.configurations.typescriptreact = {
request = "launch",
url = 'http://localhost:3000',
webRoot = '${workspaceFolder}',
firefoxExecutable = '/usr/bin/waterfox',
firefoxExecutable = '/usr/bin/firefox',
pathMappings = {
{
url = "webpack://_n_e/",
@@ -91,7 +91,6 @@ require("dapui").setup()
local dap, dapui = require("dap"), require("dapui")
dap.listeners.after.event_initialized["dapui_config"] = function()
dapui.open({})
end

View File

@@ -0,0 +1,4 @@
require('dropbar').setup()
vim.ui.select = require('dropbar.utils.menu').select
vim.api.nvim_set_hl(0, 'DropBarMenuHoverEntry', { link = 'PmenuExtraSel' })
vim.api.nvim_set_hl(0, 'WinBarNC', { link = 'Tag' })

View 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`
},
})

View File

@@ -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,
},
},
}

View File

@@ -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',

View File

@@ -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,
})

View File

@@ -0,0 +1,46 @@
local navic = require("nvim-navic")
navic.setup {
icons = {
File = "󰈙 ",
Module = "",
Namespace = "󰌗 ",
Package = "",
Class = "󰌗 ",
Method = "󰆧 ",
Property = "",
Field = "",
Constructor = "",
Enum = "󰕘",
Interface = "󰕘",
Function = "󰊕 ",
Variable = "󰆧 ",
Constant = "󰏿 ",
String = "󰀬 ",
Number = "󰎠 ",
Boolean = "",
Array = "󰅪 ",
Object = "󰅩 ",
Key = "󰌋 ",
Null = "󰟢 ",
EnumMember = "",
Struct = "󰌗 ",
Event = "",
Operator = "󰆕 ",
TypeParameter = "󰊄 ",
},
lsp = {
auto_attach = true,
preference = nil,
},
highlight = true,
seperator = '',
depth_limit = 0,
depth_limit_indicator = "..",
safe_output = true,
lazy_update_context = false,
click = false,
format_text = function(text)
return text
end,
}

View File

@@ -1,11 +1,19 @@
require("neo-tree").setup({
close_if_last_window = false,
popup_border_style = "rounded",
enable_git_status = true,
enable_diagnostics = true,
source_selector = {
separator = { left = "", right = "" },
separator_active = false,
show_separator_on_edge = false,
},
popup_border_style = "NC",
open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
sort_case_insensitive = false,
sort_function = nil,
window = {
separator_position = "left",
},
default_component_configs = {
diagnostics = {
symbols = {

View File

@@ -1,9 +1,15 @@
local navic = require("nvim-navic")
vim.g.rustaceanvim = {
server = {
on_attach = function(client, bufnr)
navic.attach(client, bufnr)
end,
settings = {
['rust-analyzer'] = {
procMacro = {
enable = true,
numThreads = 6,
cachePriming = {
numThreads = false
},
assist = {
importEnforceGranularity = true,
@@ -16,11 +22,15 @@ vim.g.rustaceanvim = {
command = "clippy",
allFeatures = true
},
procMacro = {
enable = true,
},
inlayHints = {
lifetimeElisionHints = {
enable = true,
useParameterNames = true
}
parameterHints = false,
lifetimeElisionHints = false,
chainingHints = false,
bindingModeHints = false,
renderColons = false,
}
}
}

View File

@@ -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>")

View File

@@ -5,6 +5,9 @@ return {
{
'nvim-telescope/telescope-ui-select.nvim'
},
{
"LunarVim/breadcrumbs.nvim",
},
{
"akinsho/bufferline.nvim",
},
@@ -26,6 +29,9 @@ return {
{
'kevinhwang91/promise-async',
},
{
"SmiteshP/nvim-navic",
},
{
'theHamsta/nvim-dap-virtual-text',
},
@@ -108,21 +114,24 @@ return {
require("dapui").setup()
end
},
{
'Bekaboo/dropbar.nvim',
dependencies = {
'nvim-telescope/telescope-fzf-native.nvim',
build = 'make'
},
config = function()
local dropbar_api = require('dropbar.api')
vim.keymap.set('n', '<Leader>;', dropbar_api.pick, { desc = 'Pick symbols in winbar' })
vim.keymap.set('n', '[;', dropbar_api.goto_context_start, { desc = 'Go to start of current context' })
vim.keymap.set('n', '];', dropbar_api.select_next_context, { desc = 'Select next context' })
end
},
{
"hrsh7th/nvim-cmp",
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",

View File

@@ -1,4 +1,12 @@
return {
{
"catppuccin/nvim",
name = "catppuccin",
priority = 1000
},
{
"nvim-treesitter/playground"
},
{
"kaarmu/typst.vim",
lazy = true,
@@ -7,6 +15,10 @@ return {
'MunifTanjim/prettier.nvim',
lazy = true,
},
{
'MunifTanjim/eslint.nvim',
lazy = true,
},
{
'akinsho/toggleterm.nvim', version = "*", config = true
},
@@ -45,7 +57,7 @@ return {
},
{
'mrcjkb/rustaceanvim',
version = '^5', -- Recommended
version = '^6', -- Recommended
lazy = false, -- This plugin is already lazy
}
}