Compare commits
No commits in common. "942f00c0d1b2dfefb4f83d2ce017a5c98bfb7a39" and "3179c6444f97c94d2ce4113afa9fc1e93681d677" have entirely different histories.
942f00c0d1
...
3179c6444f
@ -1,12 +1,10 @@
|
||||
vim.fn.sign_define('DapBreakpoint', { text = '🟥', texthl = '', linehl = '', numhl = '' })
|
||||
vim.fn.sign_define('DapStopped', { text = '⭐️', texthl = '', linehl = '', numhl = '' })
|
||||
vim.fn.sign_define('DapBreakpoint', {text='🟥', texthl='', linehl='', numhl=''})
|
||||
vim.fn.sign_define('DapStopped', {text='⭐️', texthl='', linehl='', numhl=''})
|
||||
local dap = require('dap')
|
||||
local dapui = require("dapui")
|
||||
|
||||
local M = {}
|
||||
local M ={}
|
||||
|
||||
--local DEBUGGER_PATH = {os.getenv('HOME')..'/.local/share/nvim/mason/packages/js-debug-adapter'}
|
||||
local DEBUGGER_PATH = vim.fn.stdpath "data" .. "/site/pack/packer/opt/vscode-js-debug"
|
||||
local DEBUGGER_PATH = {os.getenv('HOME')..'/.local/share/nvim/mason/packages/js-debug-adapter'}
|
||||
|
||||
function M.setup()
|
||||
dap.adapters.lldb = {
|
||||
@ -21,7 +19,7 @@ function M.setup()
|
||||
type = 'lldb',
|
||||
request = 'launch',
|
||||
program = function()
|
||||
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
||||
return vim.fn.input('Path to executable: ',vim.fn.getcwd() .. '/', 'file')
|
||||
end,
|
||||
cwd = '${workspaceFolder}',
|
||||
stopOnEntry = false,
|
||||
@ -33,50 +31,40 @@ function M.setup()
|
||||
require('dap-vscode-js').setup {
|
||||
node_path = "node",
|
||||
debugger_path = DEBUGGER_PATH,
|
||||
adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" }
|
||||
adapters = {"pwa-node","pwa-chrome","pwa-msedge","node-terminal", "pwa-extensionHost"}
|
||||
}
|
||||
for _, language in ipairs { "typescript", "javascript" } do
|
||||
dap.configurations[language] = { {
|
||||
for _, language in ipairs {"typescript", "javascript"} do
|
||||
dap.configurations[language] ={{
|
||||
type = "pwa-node",
|
||||
request = "launch",
|
||||
name = "Launch File",
|
||||
program = "${file}",
|
||||
cwd = "${workspaceFolder}"
|
||||
cwd = "${workspacefolder}"
|
||||
},
|
||||
{
|
||||
type = "pwa-node",
|
||||
request = "attach",
|
||||
name = "Attach",
|
||||
processId = require("dap.utils").pick_process,
|
||||
cwd = "${workspaceFolder}"
|
||||
{
|
||||
type = "pwa-node",
|
||||
request = "attach",
|
||||
name = "Attach",
|
||||
processId = require("dap.utils").pick_process,
|
||||
cwd = "${workspacefolder}"
|
||||
},
|
||||
{
|
||||
type = "pwa-node",
|
||||
request = "launch",
|
||||
name = "Debug Jest Tests",
|
||||
runtimeExecutable = "node",
|
||||
runtimeArgs = {
|
||||
"./node_modules/jest/bin/jestj",
|
||||
"--runInBand",
|
||||
},
|
||||
{
|
||||
type = "pwa-node",
|
||||
request = "launch",
|
||||
name = "Debug Jest Tests",
|
||||
runtimeExecutable = "node",
|
||||
runtimeArgs = {
|
||||
"./node_modules/jest/bin/jest.js",
|
||||
"--runInBand",
|
||||
},
|
||||
rootPath = "${workspaceFolder}",
|
||||
console = "integratedTerminal",
|
||||
internalConsoleOptions = "neverOpen",
|
||||
cwd = "${workspaceFolder}"
|
||||
} }
|
||||
rootPath = "${workspaceFolder}",
|
||||
console = "integratedTerminal",
|
||||
internalConsoleOptions = "neverOpen",
|
||||
cwd = "${workspacefolder}"
|
||||
}}
|
||||
end
|
||||
end
|
||||
|
||||
require("dapui").setup()
|
||||
|
||||
M.setup()
|
||||
dap.listeners.after.event_initialized["dapui_config"] = function()
|
||||
dapui.open()
|
||||
end
|
||||
dap.listeners.before.event_terminated["dapui_config"] = function()
|
||||
dapui.close()
|
||||
end
|
||||
dap.listeners.before.event_exited["dapui_config"] = function()
|
||||
dapui.close()
|
||||
end
|
||||
return M
|
||||
|
||||
|
@ -5,7 +5,7 @@ vim.cmd[[set termguicolors]]
|
||||
--vim.cmd[[let ayucolor = "light"]]
|
||||
--vim.cmd[[colorscheme ayu]]
|
||||
vim.cmd[[set background=light]]
|
||||
vim.cmd[[colorscheme gruvbox]]
|
||||
vim.cmd([[
|
||||
runtime macros/sandwich/keymap/surround.vim
|
||||
]])
|
||||
vim.cmd.colorscheme "gruvbox"
|
||||
|
@ -53,7 +53,7 @@ require('mason-lspconfig').setup_handlers {
|
||||
capabilities = capabilities
|
||||
}
|
||||
end,
|
||||
['rust_analyzer'] = function()
|
||||
['rust_analyzer'] = function()
|
||||
local rustToolsOpts = {
|
||||
tools = {
|
||||
inlay_hints = {
|
||||
@ -68,7 +68,7 @@ require('mason-lspconfig').setup_handlers {
|
||||
capabilities = capabilities,
|
||||
flags = lsp_flags,
|
||||
settings = {
|
||||
["rust_analyzer"] = {
|
||||
["rust_analyzer"] = {
|
||||
checkOnSave = {
|
||||
command = "clippy"
|
||||
}
|
||||
@ -84,27 +84,11 @@ require('mason-lspconfig').setup_handlers {
|
||||
flags = lsp_flags,
|
||||
-- server-specific settings...
|
||||
settings = {
|
||||
["rust-analyzer"] = {}
|
||||
["rust-analyzer"] = {}
|
||||
}
|
||||
}
|
||||
end,
|
||||
['html'] = function()
|
||||
require('lspconfig')['html'].setup {
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
cmd = { "html-languageserver", "--stdio" },
|
||||
filetypes = { "html" },
|
||||
init_options = {
|
||||
configurationSection = { "html", "css", "javascript" },
|
||||
embeddedLanguages = {
|
||||
css = true,
|
||||
javascript = true
|
||||
}
|
||||
},
|
||||
settings = {}
|
||||
}
|
||||
end,
|
||||
['yamlls'] = function()
|
||||
['yamlls'] = function()
|
||||
require('lspconfig')["yamlls"].setup {
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
|
@ -88,7 +88,7 @@ require 'nvim-tree'.setup {
|
||||
},
|
||||
actions = {
|
||||
open_file = {
|
||||
resize_window = true,
|
||||
resize_window = false,
|
||||
window_picker = {
|
||||
exclude = {
|
||||
filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
|
||||
|
@ -14,11 +14,6 @@ require("packer").startup(function(use)
|
||||
"nvim-telescope/telescope-dap.nvim",
|
||||
{ "jbyuki/one-small-step-for-vimkind", module = "osv" },
|
||||
"mxsdev/nvim-dap-vscode-js",
|
||||
{
|
||||
"microsoft/vscode-js-debug",
|
||||
opt = true,
|
||||
run = "npm install --legacy-peer-deps && np guld vsDebugServerBundle && mv dist out",
|
||||
}
|
||||
}
|
||||
}
|
||||
use("jose-elias-alvarez/null-ls.nvim")
|
||||
@ -122,6 +117,4 @@ require("packer").startup(function(use)
|
||||
use { 'shuntaka9576/preview-swagger.nvim' }
|
||||
use 'tpope/vim-surround'
|
||||
use 'towolf/vim-helm'
|
||||
use { 'catppuccin/nvim', as = "catppuccin" }
|
||||
use 'gpanders/editorconfig.nvim'
|
||||
end)
|
||||
|
@ -1,49 +1,28 @@
|
||||
require('telescope').load_extension('lsp_handlers')
|
||||
local trouble = require('trouble.providers.telescope')
|
||||
require('telescope').setup({
|
||||
defaults = {
|
||||
mappings = {
|
||||
defaults={
|
||||
mappings={
|
||||
i = { ["<c-t>"] = trouble.open_with_trouble },
|
||||
n = { ["<c-t>"] = trouble.open_with_trouble },
|
||||
},
|
||||
path_display = { "smart" },
|
||||
path_display={"smart"},
|
||||
},
|
||||
pickers = {
|
||||
live_grep = {
|
||||
results_title = false,
|
||||
layout_strategy = 'vertical',
|
||||
dynamic_preview_title = true,
|
||||
sorting_strategy = 'ascending',
|
||||
additional_args = { '--trim' },
|
||||
layout_config = {
|
||||
prompt_position = 'top',
|
||||
width = 0.95,
|
||||
height = 0.95,
|
||||
mirror = true,
|
||||
--flex = {
|
||||
-- flip_columns = 100,
|
||||
-- flip_lines = 10,
|
||||
-- vertical = {
|
||||
-- mirror = false,
|
||||
-- },
|
||||
-- horizontal = {
|
||||
-- mirror = false
|
||||
-- },
|
||||
--},
|
||||
}
|
||||
},
|
||||
find_files = {
|
||||
theme = "dropdown",
|
||||
layout_config = {
|
||||
horizontal = { width = 0.5 }
|
||||
pickers={
|
||||
find_files={
|
||||
theme="dropdown",
|
||||
layout_config={
|
||||
horizontal= {width=0.5}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
extensions = {
|
||||
lsp_handlers = {
|
||||
code_action = {
|
||||
telescope = require('telescope.themes').get_dropdown({}),
|
||||
},
|
||||
},
|
||||
},
|
||||
extensions = {
|
||||
lsp_handlers = {
|
||||
code_action = {
|
||||
telescope = require('telescope.themes').get_dropdown({}),
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
@ -363,11 +363,6 @@ _G.packer_plugins = {
|
||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
|
||||
url = "https://github.com/airblade/vim-gitgutter"
|
||||
},
|
||||
["vim-helm"] = {
|
||||
loaded = true,
|
||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-helm",
|
||||
url = "https://github.com/towolf/vim-helm"
|
||||
},
|
||||
["vim-highlightedyank"] = {
|
||||
loaded = true,
|
||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-highlightedyank",
|
||||
@ -378,22 +373,11 @@ _G.packer_plugins = {
|
||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-sandwich",
|
||||
url = "https://github.com/machakann/vim-sandwich"
|
||||
},
|
||||
["vim-surround"] = {
|
||||
loaded = true,
|
||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-surround",
|
||||
url = "https://github.com/tpope/vim-surround"
|
||||
},
|
||||
["vim-vsnip"] = {
|
||||
loaded = true,
|
||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-vsnip",
|
||||
url = "https://github.com/hrsh7th/vim-vsnip"
|
||||
},
|
||||
["vscode-js-debug"] = {
|
||||
loaded = false,
|
||||
needs_bufread = false,
|
||||
path = "/home/markus/.local/share/nvim/site/pack/packer/opt/vscode-js-debug",
|
||||
url = "https://github.com/microsoft/vscode-js-debug"
|
||||
},
|
||||
["which-key.nvim"] = {
|
||||
config = { "\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\0" },
|
||||
loaded = true,
|
||||
@ -431,14 +415,14 @@ if not vim.g.packer_custom_loader_enabled then
|
||||
vim.g.packer_custom_loader_enabled = true
|
||||
end
|
||||
|
||||
-- Config for: which-key.nvim
|
||||
time([[Config for which-key.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\0", "config", "which-key.nvim")
|
||||
time([[Config for which-key.nvim]], false)
|
||||
-- Config for: toggleterm.nvim
|
||||
time([[Config for toggleterm.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n8\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim")
|
||||
time([[Config for toggleterm.nvim]], false)
|
||||
-- Config for: which-key.nvim
|
||||
time([[Config for which-key.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\0", "config", "which-key.nvim")
|
||||
time([[Config for which-key.nvim]], false)
|
||||
-- Config for: nvim-test
|
||||
time([[Config for nvim-test]], true)
|
||||
try_loadstring("\27LJ\2\n7\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\14nvim-test\frequire\0", "config", "nvim-test")
|
||||
|
Loading…
Reference in New Issue
Block a user