Merge branch 'master' into sync

This commit is contained in:
Andres 2023-06-14 00:11:21 +02:00
commit 5abfb95a13
13 changed files with 241 additions and 106 deletions

1
lua/custom/init.lua Normal file
View file

@ -0,0 +1 @@

View file

@ -0,0 +1,9 @@
-- File: lua/custom/plugins/autopairs.lua
return {
"windwp/nvim-autopairs",
config = function()
require("nvim-autopairs").setup {}
end,
}

View file

@ -0,0 +1,4 @@
return {
'weilbith/nvim-code-action-menu',
}

View file

@ -0,0 +1,45 @@
return {
"catppuccin/nvim",
name = "catppuccin",
config = function()
require("catppuccin").setup {
flavour = "mocha", -- latte, frappe, macchiato, mocha
term_colors = true,
transparent_background = false,
no_italic = false,
no_bold = false,
styles = {
comments = {},
conditionals = {},
loops = {},
functions = {},
keywords = {},
strings = {},
variables = {},
numbers = {},
booleans = {},
properties = {},
types = {},
},
color_overrides = {
mocha = {
base = "#000000",
mantle = "#000000",
crust = "#000000",
},
},
highlight_overrides = {
mocha = function(C)
return {
TabLineSel = { bg = C.pink },
CmpBorder = { fg = C.surface2 },
Pmenu = { bg = C.none },
TelescopeBorder = { link = "FloatBorder" },
}
end,
},
}
vim.cmd.colorscheme "catppuccin"
end,
}

View file

@ -0,0 +1,3 @@
return {
'github/copilot.vim',
}

View file

@ -0,0 +1,19 @@
return {
"nvim-neo-tree/neo-tree.nvim",
version = "*",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim",
},
config = function()
-- Unless you are still migrating, remove the deprecated commands from v1.x
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
require('neo-tree').setup {
window = {
width = 24,
}
}
end,
}

View file

@ -0,0 +1,5 @@
-- using packer.nvim
return {
'nmac427/guess-indent.nvim',
config = function() require('guess-indent').setup {} end,
}

View file

@ -19,7 +19,7 @@ return {
'jay-babu/mason-nvim-dap.nvim',
-- Add your own debuggers here
'leoluz/nvim-dap-go',
-- 'leoluz/nvim-dap-go',
},
config = function()
local dap = require 'dap'
@ -38,19 +38,22 @@ return {
-- online, please don't ask me how to install them :)
ensure_installed = {
-- Update this to ensure that you have the debuggers for the langs you want
'delve',
-- 'delve',
-- 'codelldb'
},
}
-- Basic debugging keymaps, feel free to change to your liking!
vim.keymap.set('n', '<F5>', dap.continue)
vim.keymap.set('n', '<F1>', dap.step_into)
vim.keymap.set('n', '<F2>', dap.step_over)
vim.keymap.set('n', '<F3>', dap.step_out)
vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint)
vim.keymap.set('n', '<F5>', dap.continue, { desc = "Start debugger" })
vim.keymap.set('n', '<F1>', dap.step_into, { desc = "Step into" })
vim.keymap.set('n', '<F2>', dap.step_over, { desc = "Step over" })
vim.keymap.set('n', '<F3>', dap.step_out, { desc = "Step out" })
vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, { desc = "Toggle breakpoint" })
vim.keymap.set('n', '<leader>B', function()
dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
end)
dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
end
,
{ desc = "Breakpoint condition" })
-- Dap UI setup
-- For more information, see |:help nvim-dap-ui|
@ -80,7 +83,11 @@ return {
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
dap.listeners.before.event_exited['dapui_config'] = dapui.close
-- local mason_registry = require("mason-registry")
--
-- local codelldb = mason_registry.get_package('codelldb')
-- local extension_path = codelldb:get_install_path() .. "/extension/"
-- Install golang specific config
require('dap-go').setup()
-- require('dap-go').setup()
end,
}