Compare commits

...

7 Commits

8 changed files with 116 additions and 12 deletions

View File

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

View File

@@ -1,7 +1,7 @@
local dap = require('dap') local dap = require('dap')
require("dap-vscode-js").setup({ 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" }, debugger_cmd = { "js-debug-adapter" },
adapters = { 'node-terminal' }, adapters = { 'node-terminal' },
}) })
@@ -28,7 +28,7 @@ dap.adapters["pwa-node"] = {
port = "${port}", port = "${port}",
executable = { executable = {
command = "node", 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 = { dap.adapters.chrome = {
type = "executable", type = "executable",
command = "node", 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 = { dap.adapters.firefox = {
type = 'executable', type = 'executable',
command = 'node', 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 = { dap.configurations.typescriptreact = {
@@ -75,7 +75,7 @@ dap.configurations.typescriptreact = {
request = "launch", request = "launch",
url = 'http://localhost:3000', url = 'http://localhost:3000',
webRoot = '${workspaceFolder}', webRoot = '${workspaceFolder}',
firefoxExecutable = '/usr/bin/waterfox', firefoxExecutable = '/usr/bin/firefox',
pathMappings = { pathMappings = {
{ {
url = "webpack://_n_e/", url = "webpack://_n_e/",
@@ -91,7 +91,6 @@ require("dapui").setup()
local dap, dapui = require("dap"), require("dapui") local dap, dapui = require("dap"), require("dapui")
dap.listeners.after.event_initialized["dapui_config"] = function() dap.listeners.after.event_initialized["dapui_config"] = function()
dapui.open({}) dapui.open({})
end 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,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({ require("neo-tree").setup({
close_if_last_window = false, close_if_last_window = false,
popup_border_style = "rounded",
enable_git_status = true, enable_git_status = true,
enable_diagnostics = 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" }, open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
sort_case_insensitive = false, sort_case_insensitive = false,
sort_function = nil, sort_function = nil,
window = {
separator_position = "left",
},
default_component_configs = { default_component_configs = {
diagnostics = { diagnostics = {
symbols = { symbols = {

View File

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

View File

@@ -5,6 +5,9 @@ return {
{ {
'nvim-telescope/telescope-ui-select.nvim' 'nvim-telescope/telescope-ui-select.nvim'
}, },
{
"LunarVim/breadcrumbs.nvim",
},
{ {
"akinsho/bufferline.nvim", "akinsho/bufferline.nvim",
}, },
@@ -26,6 +29,9 @@ return {
{ {
'kevinhwang91/promise-async', 'kevinhwang91/promise-async',
}, },
{
"SmiteshP/nvim-navic",
},
{ {
'theHamsta/nvim-dap-virtual-text', 'theHamsta/nvim-dap-virtual-text',
}, },
@@ -108,6 +114,19 @@ return {
require("dapui").setup() require("dapui").setup()
end 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", "hrsh7th/nvim-cmp",
event = "InsertEnter", event = "InsertEnter",

View File

@@ -1,6 +1,11 @@
return { return {
{ {
'Mofiqul/vscode.nvim', "catppuccin/nvim",
name = "catppuccin",
priority = 1000
},
{
"nvim-treesitter/playground"
}, },
{ {
"kaarmu/typst.vim", "kaarmu/typst.vim",
@@ -52,7 +57,7 @@ return {
}, },
{ {
'mrcjkb/rustaceanvim', 'mrcjkb/rustaceanvim',
version = '^5', -- Recommended version = '^6', -- Recommended
lazy = false, -- This plugin is already lazy lazy = false, -- This plugin is already lazy
} }
} }