Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #44

Merged
merged 8 commits into from
Oct 1, 2023
Merged

Develop #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df1fa47
chore(*): update package
Sep 11, 2023
0bfdeaf
chore(*): algunos cambios de temas
Sep 12, 2023
8be9682
chore(*): update package lazy-lock
fabianmolinab Sep 19, 2023
d503aa1
feat(docs): documentacion de lista de errores
fabianmolinab Sep 28, 2023
5ec1495
fix: errores de autopairs corregidos
fabianmolinab Oct 1, 2023
f3f1363
feat: actualizacion del plugin neo-tree
fabianmolinab Oct 1, 2023
e41f25d
feat: activacion del plugin de bufferline y ...
fabianmolinab Oct 1, 2023
cd1bf0a
Merge pull request #43 from fabianmolinab/linux-wsl
fabianmolinab Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/list-errors.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[x] error plugins autopairs not install
57 changes: 28 additions & 29 deletions lazy-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" },
"LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" },
"bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" },
Expand All @@ -9,45 +10,43 @@
"cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" },
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" },
"friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
"gitsigns.nvim": { "branch": "main", "commit": "31178496552584e84fa9e74e087dec1f6c347f5d" },
"friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
"gitsigns.nvim": { "branch": "main", "commit": "e32efa6d6acb4a2e2e270f329df6a65080702066" },
"gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" },
"indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
"lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
"indent-blankline.nvim": { "branch": "master", "commit": "3d26bc7ab0e8dfddc0f40c840a8f925dddc2fef6" },
"lazy.nvim": { "branch": "main", "commit": "59335c5b9d116f5d3948f833288a89e2a829a005" },
"lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "48025d62f45af52ba47e4193b854864839392e4c" },
"mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
"mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "7951701fd21291ac473ea92d3fd57ec5c8bf10bb" },
"neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" },
"nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" },
"mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
"neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
"nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" },
"nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" },
"nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" },
"npairs-integrate-upair": { "branch": "main", "commit": "a84fb7a53f802f6a8a13184c91254389adb6d5a0" },
"nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
"nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
"nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
"nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
"nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" },
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" },
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
"nvim-jdtls": { "branch": "master", "commit": "095dc490f362adc85be66dc14bd9665ddd94413b" },
"nvim-lspconfig": { "branch": "master", "commit": "c0de180ddb3df36feef8ac3607670894d0e7497f" },
"nvim-treesitter": { "branch": "master", "commit": "8d5e5dc40a4c480483690777cefb8cf67e710702" },
"nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" },
"nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
"nvim-jdtls": { "branch": "master", "commit": "3ca419c52a7c20a2565237db2c110ed68fc7e6f1" },
"nvim-lspconfig": { "branch": "master", "commit": "eb1b53162755888ff75e495797071644d983bff7" },
"nvim-treesitter": { "branch": "master", "commit": "811e8ba4f37821a9e7fe645573ceac4ee47cd542" },
"nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
"nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
"nvim-web-devicons": { "branch": "master", "commit": "eb8f80f30fd5e9a6176dee5c46661ebd7437ac46" },
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
"telescope.nvim": { "branch": "master", "commit": "5a3fb8a012f9fcf777ba8deeae1c759362413efa" },
"tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" },
"nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
"plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
"telescope.nvim": { "branch": "master", "commit": "7d51950854a3f8853c5c0d570757095e9a5af313" },
"tmux.nvim": { "branch": "main", "commit": "673782b74a6055d430d3f5148a033edd99e5519f" },
"todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
"trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
"ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" },
"trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
"ultimate-autopair.nvim": { "branch": "v0.6", "commit": "cca248f35bb23c38596e7a33ba6cc607ef69f142" },
"vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" },
"vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" },
"vim-fugitive": { "branch": "master", "commit": "99db68d9b3304580bd383da7aaee05c7a954a344" },
"vim-move": { "branch": "master", "commit": "244a2908ffbca3d09529b3ec24c2c090f489f401" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" }
Expand Down
145 changes: 66 additions & 79 deletions lua/plugins/config/autopairs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,85 +2,72 @@ local mode = { "i", "c" }
local globals = require('globals')

return {
"altermo/npairs-integrate-upair",
lazy = true,
keys = {
{ "{", mode = mode },
{ "[", mode = mode },
{ "(", mode = mode },
{ '"', mode = mode },
{ "'", mode = mode },
{ "`", mode = mode },
{ "<CR>", mode = "i" },
{ "<BS>", mode = "i" },
{ "<A-e>", mode = "i" },
{ "<A-E>", mode = "i" },
{ "<A-]>", mode = "i" },
{ "<A-C-e>", mode = "i" },
{ "<Space>", mode = "i" },
{
{
"windwp/nvim-autopairs",
keys = {
{ "<M-e>", mode = "i" },
{ "<CR>", mode = "i" },
{ "{", mode = "i" },
{ "[", mode = "i" },
{ "(", mode = "i" },
{ '"', mode = "i" },
{ "'", mode = "i" },
{ "`", mode = "i" },
{ "<", mode = "i" },
},
lazy = true,
init = function()
globals.a.nvim_create_autocmd("User", {
pattern = "IntPairsComp",
callback = function()
require("cmp").event:on("confirm_done", require("nvim-autopairs.completion.cmp").on_confirm_done())
end,
once = true,
})
end,
config = function()
require("nvim-autopairs").setup({
map_bs = false,
disable_filetype = {"checkhealth", "help", "lazy", "man", "netrw", "qf" },
check_ts = true,
fast_wrap = { highlight = "Question", highlight_grey = "LspCodeLens" },
})
end,
},
{
"hrsh7th/nvim-cmp",
optional = true,
opts = function()
require("cmp").event:on("menu_opened", function()
if globals.a.nvim_get_mode().mode:sub(1, 1) ~= "c" then
globals.a.nvim_exec_autocmds("User", { pattern = "IntPairsComp", modeline = false })
end
end)
end,
},
},
dependencies = {
{ "windwp/nvim-autopairs", dependencies = "nvim-treesitter/nvim-treesitter" },
{ "altermo/ultimate-autopair.nvim", dependencies = "nvim-treesitter/nvim-treesitter" },
{
"altermo/ultimate-autopair.nvim",
keys = {
{ "<A-)>", mode = mode },
{ "<BS>", mode = mode },
{ "<Space>", mode = mode },
{ "{", mode = "c" },
{ "[", mode = "c" },
{ "(", mode = "c" },
{ '"', mode = "c" },
{ "'", mode = "c" },
{ "`", mode = "c" },
},
lazy = true,
config = function()
require("ultimate-autopair").setup({
pair_map = false,
cr = { enable = false },
space2 = { enable = true },
fastwarp = { enable = false },
})
end,
},
init = function()
globals.a.nvim_create_autocmd("User", {
pattern = "IntPairsComp",
callback = function()
if not package.loaded["npairs-int-upair"] then
require("lazy").load({ plugins = { "npairs-integrate-upair" } })
end

require("cmp").event:on("confirm_done", require("nvim-autopairs.completion.cmp").on_confirm_done())
end,
once = true,
})
end,
config = function()
require("npairs-int-upair").setup({
bs = "u",
npairs_conf = {
disable_filetype = {
"aerial",
"checkhealth",
"dapui_breakpoints",
"dapui_console",
"dapui_scopes",
"dapui_stacks",
"DressingSelect",
"help",
"lazy",
"lspinfo",
"man",
"mason",
"null-ls-info",
"qf",
},
check_ts = true,
fast_wrap = { highlight = "Question", highlight_grey = "Dimmed" },
},
upair_conf = {
extensions = {
filetype = {
nft = {
"aerial",
"checkhealth",
"dapui_breakpoints",
"dapui_console",
"dapui_scopes",
"dapui_stacks",
"DressingSelect",
"help",
"lazy",
"lspinfo",
"man",
"mason",
"null-ls-info",
"qf",
},
},
},
},
})
end,
}
3 changes: 2 additions & 1 deletion lua/plugins/config/black-indent.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ local open_file_event = { "BufNewFile", "BufRead", "BufAdd", "SessionLoadPost" }
local globals = require('globals')
return {
"lukas-reineke/indent-blankline.nvim",
main = "ibl", opts = {},
depedencies = "nvim-treesitter/nvim-treesitter",
event = open_file_event,
config = function()
Expand All @@ -11,7 +12,7 @@ return {
--vim.opt.listchars:append "space:·"
--vim.opt.listchars:append "eol:↓"

require("indent_blankline").setup({
require("ibl").setup({
use_treesitter = true,
show_current_context = true,
show_current_context_start = true,
Expand Down
0 lua/plugins/desc/bufferline.lua → lua/plugins/config/bufferline.lua
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions lua/plugins/config/cmp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ return {
local lspkind = require 'lspkind'
local luasnip = require 'luasnip'
local cmp_buffer = require 'cmp_buffer'
local cmp_autopairs = require 'nvim-autopairs.completion.cmp'

cmp.setup({
performance = { debounce = 42, throttle = 42, fetching_time = 300 },
Expand Down Expand Up @@ -110,11 +109,6 @@ return {
{ max_item_count = 10 },
})
})
--Autopairs
cmp.event:on(
'confirm_done',
cmp_autopairs.on_confirm_done()
)
-- Configuración de altura de ventanas flotantes
globals.opt.pumheight = 10
globals.opt.cmdwinheight = 10
Expand Down
3 changes: 2 additions & 1 deletion lua/plugins/config/neo-tree.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ return {
"nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
dependencies = { "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim" },
deactivate = function() require("neo-tree.command").execute({action = "close"}) end,
config = function()
require("neo-tree").setup({
enable_diagnostics = true,
hide_root_node = true,
resize_timer_interval = 42,
auto_clean_after_session_restore = true,
popup_bourder_style = "rounded",
use_default_mappings = false,
source_selector = {
winbar = true,
Expand Down
4 changes: 2 additions & 2 deletions lua/themes/gruvboxMaterial.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
return {
"sainnhe/gruvbox-material",
lazy = false,
enabled = false,
enabled = true,
priority = 1000,
config = function()
vim.g.gruvbox_material_background = 'hard'
vim.g.gruvbox_material_enable_bold = true
vim.g.gruvbox_material_enable_italic = true
vim.g.gruvbox_material_transparent_background = true
vim.g.gruvbox_material_transparent_background = false

vim.cmd('colorscheme gruvbox-material')
end
Expand Down
2 changes: 1 addition & 1 deletion lua/themes/nightfox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
return {
"EdenEast/nightfox.nvim",
lazy = false,
enabled = true,
enabled = false,
priority = 1000,
config = function()
require('nightfox').setup({
Expand Down