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('DapBreakpoint', {text='🟥', texthl='', linehl='', numhl=''})
|
||||||
vim.fn.sign_define('DapStopped', { text = '⭐️', texthl = '', linehl = '', numhl = '' })
|
vim.fn.sign_define('DapStopped', {text='⭐️', texthl='', linehl='', numhl=''})
|
||||||
local dap = require('dap')
|
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 = {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"
|
|
||||||
|
|
||||||
function M.setup()
|
function M.setup()
|
||||||
dap.adapters.lldb = {
|
dap.adapters.lldb = {
|
||||||
@ -21,7 +19,7 @@ function M.setup()
|
|||||||
type = 'lldb',
|
type = 'lldb',
|
||||||
request = 'launch',
|
request = 'launch',
|
||||||
program = function()
|
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,
|
end,
|
||||||
cwd = '${workspaceFolder}',
|
cwd = '${workspaceFolder}',
|
||||||
stopOnEntry = false,
|
stopOnEntry = false,
|
||||||
@ -33,22 +31,22 @@ function M.setup()
|
|||||||
require('dap-vscode-js').setup {
|
require('dap-vscode-js').setup {
|
||||||
node_path = "node",
|
node_path = "node",
|
||||||
debugger_path = DEBUGGER_PATH,
|
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
|
for _, language in ipairs {"typescript", "javascript"} do
|
||||||
dap.configurations[language] = { {
|
dap.configurations[language] ={{
|
||||||
type = "pwa-node",
|
type = "pwa-node",
|
||||||
request = "launch",
|
request = "launch",
|
||||||
name = "Launch File",
|
name = "Launch File",
|
||||||
program = "${file}",
|
program = "${file}",
|
||||||
cwd = "${workspaceFolder}"
|
cwd = "${workspacefolder}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type = "pwa-node",
|
type = "pwa-node",
|
||||||
request = "attach",
|
request = "attach",
|
||||||
name = "Attach",
|
name = "Attach",
|
||||||
processId = require("dap.utils").pick_process,
|
processId = require("dap.utils").pick_process,
|
||||||
cwd = "${workspaceFolder}"
|
cwd = "${workspacefolder}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type = "pwa-node",
|
type = "pwa-node",
|
||||||
@ -56,27 +54,17 @@ function M.setup()
|
|||||||
name = "Debug Jest Tests",
|
name = "Debug Jest Tests",
|
||||||
runtimeExecutable = "node",
|
runtimeExecutable = "node",
|
||||||
runtimeArgs = {
|
runtimeArgs = {
|
||||||
"./node_modules/jest/bin/jest.js",
|
"./node_modules/jest/bin/jestj",
|
||||||
"--runInBand",
|
"--runInBand",
|
||||||
},
|
},
|
||||||
rootPath = "${workspaceFolder}",
|
rootPath = "${workspaceFolder}",
|
||||||
console = "integratedTerminal",
|
console = "integratedTerminal",
|
||||||
internalConsoleOptions = "neverOpen",
|
internalConsoleOptions = "neverOpen",
|
||||||
cwd = "${workspaceFolder}"
|
cwd = "${workspacefolder}"
|
||||||
} }
|
}}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require("dapui").setup()
|
|
||||||
|
|
||||||
M.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
|
return M
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ vim.cmd[[set termguicolors]]
|
|||||||
--vim.cmd[[let ayucolor = "light"]]
|
--vim.cmd[[let ayucolor = "light"]]
|
||||||
--vim.cmd[[colorscheme ayu]]
|
--vim.cmd[[colorscheme ayu]]
|
||||||
vim.cmd[[set background=light]]
|
vim.cmd[[set background=light]]
|
||||||
|
vim.cmd[[colorscheme gruvbox]]
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
runtime macros/sandwich/keymap/surround.vim
|
runtime macros/sandwich/keymap/surround.vim
|
||||||
]])
|
]])
|
||||||
vim.cmd.colorscheme "gruvbox"
|
|
||||||
|
@ -88,22 +88,6 @@ require('mason-lspconfig').setup_handlers {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
end,
|
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 {
|
require('lspconfig')["yamlls"].setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
|
@ -88,7 +88,7 @@ require 'nvim-tree'.setup {
|
|||||||
},
|
},
|
||||||
actions = {
|
actions = {
|
||||||
open_file = {
|
open_file = {
|
||||||
resize_window = true,
|
resize_window = false,
|
||||||
window_picker = {
|
window_picker = {
|
||||||
exclude = {
|
exclude = {
|
||||||
filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
|
filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
|
||||||
|
@ -14,11 +14,6 @@ require("packer").startup(function(use)
|
|||||||
"nvim-telescope/telescope-dap.nvim",
|
"nvim-telescope/telescope-dap.nvim",
|
||||||
{ "jbyuki/one-small-step-for-vimkind", module = "osv" },
|
{ "jbyuki/one-small-step-for-vimkind", module = "osv" },
|
||||||
"mxsdev/nvim-dap-vscode-js",
|
"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")
|
use("jose-elias-alvarez/null-ls.nvim")
|
||||||
@ -122,6 +117,4 @@ require("packer").startup(function(use)
|
|||||||
use { 'shuntaka9576/preview-swagger.nvim' }
|
use { 'shuntaka9576/preview-swagger.nvim' }
|
||||||
use 'tpope/vim-surround'
|
use 'tpope/vim-surround'
|
||||||
use 'towolf/vim-helm'
|
use 'towolf/vim-helm'
|
||||||
use { 'catppuccin/nvim', as = "catppuccin" }
|
|
||||||
use 'gpanders/editorconfig.nvim'
|
|
||||||
end)
|
end)
|
||||||
|
@ -1,42 +1,21 @@
|
|||||||
require('telescope').load_extension('lsp_handlers')
|
require('telescope').load_extension('lsp_handlers')
|
||||||
local trouble = require('trouble.providers.telescope')
|
local trouble = require('trouble.providers.telescope')
|
||||||
require('telescope').setup({
|
require('telescope').setup({
|
||||||
defaults = {
|
defaults={
|
||||||
mappings = {
|
mappings={
|
||||||
i = { ["<c-t>"] = trouble.open_with_trouble },
|
i = { ["<c-t>"] = trouble.open_with_trouble },
|
||||||
n = { ["<c-t>"] = trouble.open_with_trouble },
|
n = { ["<c-t>"] = trouble.open_with_trouble },
|
||||||
},
|
},
|
||||||
path_display = { "smart" },
|
path_display={"smart"},
|
||||||
},
|
},
|
||||||
pickers = {
|
pickers={
|
||||||
live_grep = {
|
find_files={
|
||||||
results_title = false,
|
theme="dropdown",
|
||||||
layout_strategy = 'vertical',
|
layout_config={
|
||||||
dynamic_preview_title = true,
|
horizontal= {width=0.5}
|
||||||
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 }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
extensions = {
|
extensions = {
|
||||||
|
@ -363,11 +363,6 @@ _G.packer_plugins = {
|
|||||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
|
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
|
||||||
url = "https://github.com/airblade/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"] = {
|
["vim-highlightedyank"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-highlightedyank",
|
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",
|
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-sandwich",
|
||||||
url = "https://github.com/machakann/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"] = {
|
["vim-vsnip"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-vsnip",
|
path = "/home/markus/.local/share/nvim/site/pack/packer/start/vim-vsnip",
|
||||||
url = "https://github.com/hrsh7th/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"] = {
|
["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" },
|
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,
|
loaded = true,
|
||||||
@ -431,14 +415,14 @@ if not vim.g.packer_custom_loader_enabled then
|
|||||||
vim.g.packer_custom_loader_enabled = true
|
vim.g.packer_custom_loader_enabled = true
|
||||||
end
|
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
|
-- Config for: toggleterm.nvim
|
||||||
time([[Config for toggleterm.nvim]], true)
|
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")
|
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)
|
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
|
-- Config for: nvim-test
|
||||||
time([[Config for nvim-test]], true)
|
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")
|
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