From bb3e5435fc9003552b9478d1fda25df0faf2a5f2 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Mon, 8 May 2023 17:23:38 -0500 Subject: [PATCH 01/51] =?UTF-8?q?fix:=20se=20elimin=C3=B3=20el=20plugin=20?= =?UTF-8?q?de=20cmp=20emojis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/plugins/config/cmp.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/lua/plugins/config/cmp.lua b/lua/plugins/config/cmp.lua index b1103f0..6663594 100644 --- a/lua/plugins/config/cmp.lua +++ b/lua/plugins/config/cmp.lua @@ -93,7 +93,6 @@ return { { name = 'luasnip', keyword_length = 1, priority = 1 }, { name = 'cmp_tabnine', keyword_length = 1, priority = 2 }, { name = 'emmet', keyword_length = 1, priority = 5 }, - { name = 'emoji' }, }, window = { documentation = cmp.config.window.bordered(), @@ -124,7 +123,6 @@ return { }, { "hrsh7th/cmp-buffer", event = "InsertEnter", dependencies = "hrsh7th/nvim-cmp" }, { "hrsh7th/cmp-path", event = "InsertEnter", dependencies = "hrsh7th/nvim-cmp" }, - { "hrsh7th/cmp-emoji", event = "InsertEnter", dependencies = "hrsh7th/nvim-cmp" }, { "hrsh7th/cmp-cmdline", From f9e0fe82df7c3b0bae029406fd6a3687bda04bfc Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sat, 13 May 2023 16:31:10 -0500 Subject: [PATCH 02/51] =?UTF-8?q?fix:=20modificaci=C3=B3n=20del=20flujo=20?= =?UTF-8?q?de=20trabajo=20#34=20Se=20elimino=20el=20plugin=20neo-tree=20y?= =?UTF-8?q?=20se=20agrego=20para=20que=20telescope=20haga=20su=20trabajo?= =?UTF-8?q?=20arreglando=20el=20bug=20y=20las=20incosistencias=20entre=20a?= =?UTF-8?q?mbos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/core/keys.lua | 8 +++-- lua/plugins/config/telescope.lua | 37 +++++++++++++++++------ lua/plugins/{config => misc}/neo-tree.lua | 0 3 files changed, 33 insertions(+), 12 deletions(-) rename lua/plugins/{config => misc}/neo-tree.lua (100%) diff --git a/lua/core/keys.lua b/lua/core/keys.lua index bc417a5..4da94f8 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -53,7 +53,7 @@ a.nvim_set_keymap('n', 'sp', ':sp', { noremap = true }) -- Limpiar los resultados de búsqueda a.nvim_set_keymap('n', '//', ':noh', { silent = true }) --- Telescope +------ Telescope -- Buscar archivos a.nvim_set_keymap('n', 'f', 'lua require(\'telescope.builtin\').find_files()', { noremap = true }) -- Buscar dentro del proyecto cualquier palabra @@ -68,6 +68,8 @@ a.nvim_set_keymap('n', 'of', 'lua require(\'telescope.builtin\').ol -- Lista buffers o pestañas abiertos a.nvim_set_keymap('n', 'b', 'lua require(\'telescope.builtin\').buffers()', { noremap = true }) +a.nvim_set_keymap('n', 'p', "lua require 'telescope'.extensions.file_browser.file_browser()", {noremap = true}) +------ -- Todo Busqueda telescope a.nvim_set_keymap('n', 'td', ':TodoTelescope', {}) @@ -99,5 +101,5 @@ a.nvim_set_keymap('n', 'ds', ':DapTerminate', { noremap = true }) a.nvim_set_keymap('n', 'du', ':lua require("dapui").toggle()', { noremap = true }) -- Neotree -a.nvim_set_keymap('n', 'p', ':NeoTreeFocusToggle', { noremap = true }) -a.nvim_set_keymap('n', 'g', ':NeoTreeFocusToggle git_status', { noremap = true }) +--a.nvim_set_keymap('n', 'p', ':NeoTreeFocusToggle', { noremap = true }) +--a.nvim_set_keymap('n', 'g', ':NeoTreeFocusToggle git_status', { noremap = true }) diff --git a/lua/plugins/config/telescope.lua b/lua/plugins/config/telescope.lua index 2d15b81..ad23780 100644 --- a/lua/plugins/config/telescope.lua +++ b/lua/plugins/config/telescope.lua @@ -3,17 +3,10 @@ return { dependencies = { { "nvim-lua/plenary.nvim" }, { "nvim-tree/nvim-web-devicons" }, - }, - keys = { - { "f", function() require("telescope.builtin").find_files() end }, - { "a", function() require("telescope.builtin").live_grep() end }, - { "mf", function() require("telescope.builtin").marks() end }, - { "ls", function() require("telescope.builtin").git_commits() end }, - { "ag", function() require("telescope.builtin").git_files() end }, - { "of", function() require("telescope.builtin").oldfiles() end }, - { "b", function() require("telescope.builtin").buffers() end }, + {"nvim-telescope/telescope-file-browser.nvim"} }, config = function() + local fb_actions = require("telescope._extensions.file_browser.actions") require('telescope').setup { initial_mode = "insert", defaults = { @@ -36,13 +29,39 @@ return { theme = "ivy" }, buffers = { + initial_mode = "normal", ignore_current_buffer = true, sort_mru = true, theme = "dropdown" } }, extensions = { + file_browser = { + initial_mode = "normal", + defaults = { + layout_config = { + vertical = { width = 0.5 } + }, + file_ignore_patterns = { "node_modules", ".git" } + }, + theme = "dropdown", + cwd_to_path = true, + grouped = true, + hidden = true, + display_stat = { + date = false, mode = false + }, + mappings = { + ["n"] = { + ["a"] = fb_actions.create, + ["c"] = fb_actions.copy, + ["x"] = fb_actions.remove, + } + } + }, } } + require("telescope").load_extension "file_browser" + vim.cmd("autocmd VimEnter * :Telescope file_browser") end } diff --git a/lua/plugins/config/neo-tree.lua b/lua/plugins/misc/neo-tree.lua similarity index 100% rename from lua/plugins/config/neo-tree.lua rename to lua/plugins/misc/neo-tree.lua From 772e2314a3772f77a282852ef596ead9955c768d Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sat, 13 May 2023 16:40:06 -0500 Subject: [PATCH 03/51] fix: se arreglo el bug de `null-ls` El bug no instalaba los serves de diagnosticos y de formaters dando errores. --- lua/plugins/config/null-ls.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lua/plugins/config/null-ls.lua b/lua/plugins/config/null-ls.lua index 3b2e0b2..77415ea 100644 --- a/lua/plugins/config/null-ls.lua +++ b/lua/plugins/config/null-ls.lua @@ -2,6 +2,19 @@ -- FIX: Comprobar cuando cargar el plugin si al iniciar o con un key return { "jose-elias-alvarez/null-ls.nvim", + event = { "BufNewFile", "BufRead", "BufAdd" }, + dependencies = { + "nvim-lua/plenary.nvim", + { + "jay-babu/mason-null-ls.nvim", + dependencies = "williamboman/mason.nvim", + config = function() + require("mason-null-ls").setup({ + ensure_installed = { "jsonlint", "prettierd", "gofumpt", "goimports", "selene" }, + }) + end, + }, + }, config = function() local null_ls = require("null-ls") From b46cf469ba5f8307e0126b026e0036ee90e8d088 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sat, 13 May 2023 16:41:19 -0500 Subject: [PATCH 04/51] chore(): lazy-lock update --- lazy-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f054fbc..02bd674 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,7 +4,6 @@ "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, "cmp-emmet": { "branch": "main", "commit": "1b29294e9126c493a28b4b967c227edd77ed04d3" }, - "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-tabnine": { "branch": "main", "commit": "7fa0459b0cc0498375c5a1e14fb8d21d130bb198" }, @@ -12,20 +11,20 @@ "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, "friendly-snippets": { "branch": "main", "commit": "631f79e346b0b3203d2ce3eae619ca8d612e5463" }, "gitsigns.nvim": { "branch": "main", "commit": "e5edefd9976039f5352e0c900f35206770b33a2d" }, + "gruvbox-material": { "branch": "master", "commit": "3fff63b0d6a425ad1076a260cd4f6da61d1632b1" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "bb5cc9ef3bbb17541929b745f74551c900188099" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "43f2ddf0b5f544d9bb20e24b8ff76b79f2a07ab0" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "54d702020bf94e4eefd357f0b738317af30217eb" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6fe5eac6db65fdbad68bf638dea0a849ccb63fd7" }, "mason.nvim": { "branch": "main", "commit": "057ac5ca159c83e302a55bd839a96ff1ea2396db" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "8d485aab32da9b8841d4af977f992b82b14af469" }, "neogen": { "branch": "main", "commit": "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901" }, "nerdcommenter": { "branch": "master", "commit": "1fe9e1cfea9bb0dbc77174d776759ed67899ee50" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, "npairs-integrate-upair": { "branch": "main", "commit": "9e898dcb1d648796663791b78ae348161c4031f8" }, - "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" }, "null-ls.nvim": { "branch": "main", "commit": "33b853a3933eed3137cd055aac4e539e69832ad0" }, "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" }, "nvim-cmp": { "branch": "main", "commit": "11102d3db12c7f8b35265ad0e17a21511e5b1e68" }, @@ -38,6 +37,7 @@ "nvim-ts-rainbow2": { "branch": "master", "commit": "1ffe68cdd594633dfee0762feebfef81ed6f1fbb" }, "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "4054a5d0ab85475bf75df00cf10754d2e54b5532" }, "telescope.nvim": { "branch": "master", "commit": "713d26b98583b160b50fb827adb751f768238ed3" }, "tmux.nvim": { "branch": "main", "commit": "b6da35847df972f50df27d938b6e5ea09bcc8391" }, "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" }, @@ -45,7 +45,6 @@ "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" }, "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, "vim-fugitive": { "branch": "master", "commit": "5f0d280b517cacb16f59316659966c7ca5e2bea2" }, - "vim-horizon": { "branch": "master", "commit": "3864f6281b0b852712d8e9ef86edde512f94c1d2" }, "vim-move": { "branch": "master", "commit": "a4bbedda7ef516b4a1b74d145cd642297e82e800" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" } From b9814d20fc9b5f08131d4f0404debe6f825bcfea Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Thu, 25 May 2023 00:56:19 -0500 Subject: [PATCH 05/51] fix: nuevos cambios para plugins de telescope --- lua/core/keys.lua | 2 +- lua/plugins/config/lualine.lua | 4 ++-- lua/plugins/config/telescope.lua | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lua/core/keys.lua b/lua/core/keys.lua index 4da94f8..f59208c 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -60,7 +60,7 @@ a.nvim_set_keymap('n', 'f', 'lua require(\'telescope.builtin\').fin a.nvim_set_keymap('n', 'a', 'lua require(\'telescope.builtin\').live_grep()', { noremap = true }) a.nvim_set_keymap('n', 'mf', 'lua require(\'telescope.builtin\').marks()', { noremap = true }) -- Lista de commits -a.nvim_set_keymap('n', 'ls', 'lua require(\'telescope.builtin\').git_commits()', { noremap = true }) +a.nvim_set_keymap('n', 'co', 'lua require(\'telescope.builtin\').git_commits()', { noremap = true }) -- Buscar archivos de git a.nvim_set_keymap('n', 'ag', 'lua require(\'telescope.builtin\').git_files()', { noremap = true }) -- Lista los archivos o ventanas cerradas diff --git a/lua/plugins/config/lualine.lua b/lua/plugins/config/lualine.lua index 1bb7401..205bf30 100644 --- a/lua/plugins/config/lualine.lua +++ b/lua/plugins/config/lualine.lua @@ -4,8 +4,8 @@ return { config = function() require('lualine').setup { options = { - { icons_enabled = true }, - { theme = "auto" }, + icons_enabled = true , + theme = "enfocado", section_separators = '', component_separators = '', refresh = { diff --git a/lua/plugins/config/telescope.lua b/lua/plugins/config/telescope.lua index ad23780..1cc3b47 100644 --- a/lua/plugins/config/telescope.lua +++ b/lua/plugins/config/telescope.lua @@ -28,6 +28,17 @@ return { git_commits = { theme = "ivy" }, + git_status = { + git_icons = { + added = "A", + deleted = "D", + changed = "M", + renamed = "R", + copied = "C", + untracked = "U", + unmerged = "?", + }, + }, buffers = { initial_mode = "normal", ignore_current_buffer = true, @@ -51,6 +62,15 @@ return { display_stat = { date = false, mode = false }, + git_icons = { + added = "A", + deleted = "D", + changed = "M", + renamed = "R", + copied = "C", + untracked = "u", + unmerged = "?", + }, mappings = { ["n"] = { ["a"] = fb_actions.create, From 8c964cd8a239beb1f141afa7f4586e1dac090b7d Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Thu, 25 May 2023 00:57:24 -0500 Subject: [PATCH 06/51] fix: cambios en temas --- lua/themes/catppuccin.lua | 84 +++++++++++++++++++--------------- lua/themes/enfocado.lua | 10 +++- lua/themes/everblush.lua | 2 +- lua/themes/gruvboxMaterial.lua | 2 +- lua/themes/nightfox.lua | 6 +-- lua/themes/zenbones.lua | 8 ++-- 6 files changed, 63 insertions(+), 49 deletions(-) diff --git a/lua/themes/catppuccin.lua b/lua/themes/catppuccin.lua index f42abe6..bddeb2f 100644 --- a/lua/themes/catppuccin.lua +++ b/lua/themes/catppuccin.lua @@ -1,41 +1,49 @@ return { - "catppuccin/nvim", - lazy = false, - enabled = false, - priority = 1000, - config = function() - vim.g.catppuccin_flavour = "frappe" -- latte, frappe, macchiato, mocha + "catppuccin/nvim", + lazy = false, + enabled = false, + name = "catppuccin", + priority = 1000, + config = function() + vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha - require("catppuccin").setup({ - flavour = "macchiato", - transparent_background = false, - highlight_overrides = {}, - styles = { - comments = {}, - conditionals = {}, - loops = {}, - functions = { "italic" }, - keywords = {}, - strings = {}, - variables = {}, - numbers = {}, - booleans = {}, - properties = {}, - types = { "bold" }, - operators = {}, - }, - integrations = { - cmp = true, - gitsigns = true, - nvimtree = true, - --telescope = true, - treesitter = true, - indent_blankline = { - enabled = true, - colored_indent_levels = true, - }, - }, - }) - vim.cmd([[colorscheme catppuccin]]) - end, + require("catppuccin").setup({ + flavour = "mocha", + transparent_background = false, + highlight_overrides = {}, + styles = { + comments = {}, + conditionals = {}, + loops = {}, + functions = { "italic" }, + keywords = {}, + strings = {}, + variables = {}, + numbers = {}, + booleans = {}, + properties = {}, + types = { "italic" }, + operators = {}, + }, + color_overrides = { + mocha = { + base = '#060C11', + mantle = '#060C11', + crust = '#060C11' + } + }, + integrations = { + cmp = true, + gitsigns = true, + nvimtree = false, + telescope = true, + treesitter = true, + indent_blankline = { + enabled = true, + colored_indent_levels = true, + }, + }, + }) + vim.cmd.colorscheme "catppuccin" + end, } diff --git a/lua/themes/enfocado.lua b/lua/themes/enfocado.lua index a33c1cb..dbddf6e 100644 --- a/lua/themes/enfocado.lua +++ b/lua/themes/enfocado.lua @@ -30,8 +30,14 @@ return { vim.api.nvim_create_autocmd("ColorScheme", { pattern = "enfocado", - callback = function() vim.api.nvim_command("highlight NormalNC guibg=#1e1e1e") end, + callback = function() + vim.api.nvim_command("highlight Type cterm=NONE gui=NONE") + vim.api.nvim_command("highlight TypeBuiltin cterm=NONE gui=NONE") + end, }) end, - config = function() vim.api.nvim_command("colorscheme enfocado") end, + config = function() + vim.api.nvim_command("colorscheme enfocado") + + end, } diff --git a/lua/themes/everblush.lua b/lua/themes/everblush.lua index fd976d4..95bd4f2 100644 --- a/lua/themes/everblush.lua +++ b/lua/themes/everblush.lua @@ -8,7 +8,7 @@ return { require('everblush').setup({ -- Default options override = {}, - transparent_background = false, + transparent_background = true, nvim_tree = { contrast = false, }, diff --git a/lua/themes/gruvboxMaterial.lua b/lua/themes/gruvboxMaterial.lua index 3a77302..a62ba32 100644 --- a/lua/themes/gruvboxMaterial.lua +++ b/lua/themes/gruvboxMaterial.lua @@ -5,7 +5,7 @@ return { priority = 1000, config = function() vim.g.gruvbox_material_background = 'hard' - vim.g.gruvbox_material_enable_bold = true + vim.g.gruvbox_material_enable_bold = false vim.g.gruvbox_material_enable_italic = true vim.g.gruvbox_material_transparent_background = true diff --git a/lua/themes/nightfox.lua b/lua/themes/nightfox.lua index 15e4e71..d2b80f4 100644 --- a/lua/themes/nightfox.lua +++ b/lua/themes/nightfox.lua @@ -8,7 +8,7 @@ return { options = { compile_path = vim.fn.stdpath("cache") .. "/nightfox", compile_file_suffix = "_compiled", - --transparent = true, -- Disable setting background + transparent = true, -- Disable setting background terminal_colors = true, dim_inactive = false, -- Non focused panes set to alternative background module_default = true, -- Default enable value for modules @@ -16,10 +16,10 @@ return { comments = "italic", conditionals = "NONE", constants = "NONE", - functions = "bold", + functions = "NONE", keywords = "NONE", numbers = "NONE", - operators = "bold", + operators = "NONE", strings = "NONE", types = "italic", variables = "NONE", diff --git a/lua/themes/zenbones.lua b/lua/themes/zenbones.lua index 7cf17bb..06a0bd3 100644 --- a/lua/themes/zenbones.lua +++ b/lua/themes/zenbones.lua @@ -7,18 +7,18 @@ return { config = function() vim.cmd 'set background=dark' - --vim.cmd "colorscheme zenbones" --vim.g.zenbones = { transparent_background = true } - --vim.cmd "colorscheme zenwritten" + --vim.cmd "colorscheme zenbones" --vim.g.zenwritten = { transparent_background = true } + --vim.cmd "colorscheme zenwritten" --vim.cmd "colorscheme rosebones" --vim.g.rosebones = { transparent_background = true } - --vim.cmd "colorscheme nordbones" --vim.g.nordbones = { transparent_background = true } + --vim.cmd "colorscheme nordbones" - vim.cmd "colorscheme neobones" + --vim.cmd "colorscheme neobones" --vim.cmd "colorscheme tokyobones" --vim.cmd "colorscheme kanagawabones" --vim.cmd "colorscheme randombones" From 255cfd1857f1405424d9f989cc7e408911ed7627 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Thu, 25 May 2023 00:57:42 -0500 Subject: [PATCH 07/51] feat: update package --- lazy-lock.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 02bd674..09fde88 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "e77fa9ad0b1f4fc6cddf54e51047e17e90c7d7ed" }, + "catppuccin": { "branch": "main", "commit": "57b421ee5f7380f816791fa451e86f213b625ece" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -11,7 +12,6 @@ "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, "friendly-snippets": { "branch": "main", "commit": "631f79e346b0b3203d2ce3eae619ca8d612e5463" }, "gitsigns.nvim": { "branch": "main", "commit": "e5edefd9976039f5352e0c900f35206770b33a2d" }, - "gruvbox-material": { "branch": "master", "commit": "3fff63b0d6a425ad1076a260cd4f6da61d1632b1" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "bb5cc9ef3bbb17541929b745f74551c900188099" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, @@ -37,6 +37,7 @@ "nvim-ts-rainbow2": { "branch": "master", "commit": "1ffe68cdd594633dfee0762feebfef81ed6f1fbb" }, "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, + "sonokai": { "branch": "master", "commit": "a9b2a3e83ed4fa7a5541e41be9becaa7b436edcf" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "4054a5d0ab85475bf75df00cf10754d2e54b5532" }, "telescope.nvim": { "branch": "master", "commit": "713d26b98583b160b50fb827adb751f768238ed3" }, "tmux.nvim": { "branch": "main", "commit": "b6da35847df972f50df27d938b6e5ea09bcc8391" }, From d6d9859508f5dc284142f5689b401fc7fe30ebfc Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 11 Jun 2023 10:46:29 -0500 Subject: [PATCH 08/51] update packages lazy-lock --- lazy-lock.json | 65 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 09fde88..f578379 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,52 +1,51 @@ { - "LuaSnip": { "branch": "master", "commit": "e77fa9ad0b1f4fc6cddf54e51047e17e90c7d7ed" }, - "catppuccin": { "branch": "main", "commit": "57b421ee5f7380f816791fa451e86f213b625ece" }, + "LuaSnip": { "branch": "master", "commit": "a13af80734eb28f744de6c875330c9d3c24b5f3b" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, "cmp-emmet": { "branch": "main", "commit": "1b29294e9126c493a28b4b967c227edd77ed04d3" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-tabnine": { "branch": "main", "commit": "7fa0459b0cc0498375c5a1e14fb8d21d130bb198" }, + "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, - "friendly-snippets": { "branch": "main", "commit": "631f79e346b0b3203d2ce3eae619ca8d612e5463" }, - "gitsigns.nvim": { "branch": "main", "commit": "e5edefd9976039f5352e0c900f35206770b33a2d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "bb5cc9ef3bbb17541929b745f74551c900188099" }, - "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" }, + "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" }, + "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, + "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" }, + "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, + "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "43f2ddf0b5f544d9bb20e24b8ff76b79f2a07ab0" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" }, "mason-null-ls.nvim": { "branch": "main", "commit": "54d702020bf94e4eefd357f0b738317af30217eb" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "6fe5eac6db65fdbad68bf638dea0a849ccb63fd7" }, - "mason.nvim": { "branch": "main", "commit": "057ac5ca159c83e302a55bd839a96ff1ea2396db" }, - "neogen": { "branch": "main", "commit": "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901" }, - "nerdcommenter": { "branch": "master", "commit": "1fe9e1cfea9bb0dbc77174d776759ed67899ee50" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, + "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" }, + "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, + "nerdcommenter": { "branch": "master", "commit": "b0b09ea46c9f0509556257bd8b838b40f493d6a0" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, - "npairs-integrate-upair": { "branch": "main", "commit": "9e898dcb1d648796663791b78ae348161c4031f8" }, - "null-ls.nvim": { "branch": "main", "commit": "33b853a3933eed3137cd055aac4e539e69832ad0" }, - "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" }, - "nvim-cmp": { "branch": "main", "commit": "11102d3db12c7f8b35265ad0e17a21511e5b1e68" }, + "npairs-integrate-upair": { "branch": "main", "commit": "ee1bb41280d20868b31ce5c1c68e8fdadc70b70a" }, + "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" }, + "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" }, + "nvim-cmp": { "branch": "main", "commit": "69e7d280cbe17e318b549a10ae3cae5810946be6" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" }, - "nvim-dap-ui": { "branch": "master", "commit": "749bfe12d1447703899fa823c1c075fbe2d42c24" }, - "nvim-lspconfig": { "branch": "master", "commit": "427378a03ffc1e1bc023275583a49b1993e524d0" }, - "nvim-treesitter": { "branch": "master", "commit": "25bdc313c732cb0a2b612b9364eab8dc2acad76a" }, + "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" }, + "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, + "nvim-lspconfig": { "branch": "master", "commit": "08f1f347c718e945c3b1712ebb68c6834182cf3a" }, + "nvim-treesitter": { "branch": "master", "commit": "f9d701176cb9a3e206a4c690920a8993630c3ec8" }, "nvim-ts-autotag": { "branch": "main", "commit": "40615e96075c743ef47aaf9de966dc348bec6459" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "1ffe68cdd594633dfee0762feebfef81ed6f1fbb" }, - "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, - "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, - "sonokai": { "branch": "master", "commit": "a9b2a3e83ed4fa7a5541e41be9becaa7b436edcf" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "4054a5d0ab85475bf75df00cf10754d2e54b5532" }, - "telescope.nvim": { "branch": "master", "commit": "713d26b98583b160b50fb827adb751f768238ed3" }, - "tmux.nvim": { "branch": "main", "commit": "b6da35847df972f50df27d938b6e5ea09bcc8391" }, - "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" }, - "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" }, + "nvim-ts-rainbow2": { "branch": "master", "commit": "e1783c843fd0a604d071cb9f0c6919ac93bcd96e" }, + "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, + "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" }, + "telescope.nvim": { "branch": "master", "commit": "116dbea5800c908de4afa6e793f28f782621c65d" }, + "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, + "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, + "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" }, "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" }, "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, + "vim-enfocado": { "branch": "main", "commit": "352a16183173a86b9e06c22aa30ca14f5da3f62d" }, "vim-fugitive": { "branch": "master", "commit": "5f0d280b517cacb16f59316659966c7ca5e2bea2" }, - "vim-move": { "branch": "master", "commit": "a4bbedda7ef516b4a1b74d145cd642297e82e800" }, + "vim-move": { "branch": "master", "commit": "244a2908ffbca3d09529b3ec24c2c090f489f401" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" } } \ No newline at end of file From 2459dc2193e7013e93160556e5763ebd59d726b4 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 11 Jun 2023 10:47:21 -0500 Subject: [PATCH 09/51] feat: correcciones de estilos de codigo --- lua/plugins/config/autopairs.lua | 158 +++++++------- lua/plugins/config/dap.lua | 356 +++++++++++++++---------------- lua/plugins/config/lualine.lua | 2 +- lua/plugins/config/null-ls.lua | 1 - 4 files changed, 258 insertions(+), 259 deletions(-) diff --git a/lua/plugins/config/autopairs.lua b/lua/plugins/config/autopairs.lua index f880500..686c870 100644 --- a/lua/plugins/config/autopairs.lua +++ b/lua/plugins/config/autopairs.lua @@ -1,85 +1,85 @@ local mode = { "i", "c" } -local uifiletypes = { - "aerial", - "checkhealth", - "dap-repl", - "dapui_breakpoints", - "dapui_console", - "dapui_hover", - "dapui_scopes", - "dapui_stacks", - "dapui_watches", - "DressingInput", - "DressingSelect", - "neo-tree", - "lazy", - "lspinfo", - "mason", - "nerdterm", - "noice", - "null-ls-info", - "qf", - "spectre_panel", - "TelescopePrompt", -} return { - { - "altermo/npairs-integrate-upair", - keys = { - { "{", mode = mode }, - { "[", mode = mode }, - { "(", mode = mode }, - { '"', mode = mode }, - { "'", mode = mode }, - { "`", mode = mode }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - }, - dependencies = { - { "windwp/nvim-autopairs", dependencies = "nvim-treesitter/nvim-treesitter" }, - { "altermo/ultimate-autopair.nvim", dependencies = "nvim-treesitter/nvim-treesitter" }, - }, - init = function() - vim.api.nvim_create_autocmd("InsertEnter", { - callback = function() - local ok, cmp = pcall(require, "cmp") - - if ok then - if not package.loaded["npairs-int-upair"] then - require("lazy").load({ plugins = { "npairs-integrate-upair" } }) - end - - cmp.event:on("confirm_done", require("nvim-autopairs.completion.cmp").on_confirm_done()) - end - - return true - end, - once = true, - }) - end, - config = function() - local ignored_file_types = {} - local disable = { disable = true } - - for _, filetype in pairs(uifiletypes) do - ignored_file_types[filetype] = disable - end + "altermo/npairs-integrate-upair", + lazy = true, + keys = { + { "{", mode = mode }, + { "[", mode = mode }, + { "(", mode = mode }, + { '"', mode = mode }, + { "'", mode = mode }, + { "`", mode = mode }, + { "", mode = "i" }, + { "", mode = "i" }, + { "", mode = "i" }, + { "", mode = "i" }, + { "", mode = "i" }, + { "", mode = "i" }, + { "", mode = "i" }, + }, + dependencies = { + { "windwp/nvim-autopairs", dependencies = "nvim-treesitter/nvim-treesitter" }, + { "altermo/ultimate-autopair.nvim", dependencies = "nvim-treesitter/nvim-treesitter" }, + }, + init = function() + vim.api.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("npairs-int-upair").setup({ - bs = "u", - npairs_conf = { - disable_filetype = uifiletypes, - check_ts = true, - fast_wrap = { highlight = "Question", highlight_grey = "Dimmed" }, + 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", }, - upair_conf = { internal_pairs = { ft = ignored_file_types } }, - }) - end, - }, + 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, } diff --git a/lua/plugins/config/dap.lua b/lua/plugins/config/dap.lua index f54fee7..ff2c69c 100644 --- a/lua/plugins/config/dap.lua +++ b/lua/plugins/config/dap.lua @@ -1,194 +1,194 @@ return { - "mfussenegger/nvim-dap", - keys = { - { - "", - function() - require("dap").toggle_breakpoint() - end, - }, - { - "", - function() - require("dap").continue() - end, - }, - }, - dependencies = { - { - "rcarriga/nvim-dap-ui", - config = function() - require("dapui").setup({ - layouts = { - { - elements = { "scopes", "watches", "stacks", "breakpoints" }, - size = require("wuelnerdotexe.plugin.util").get_sidebar_width(), - position = "left", - }, - { elements = { "console", "repl" }, size = 0.25, position = "bottom" }, - }, - }) - end, - }, - { - "jay-babu/mason-nvim-dap.nvim", - dependencies = "williamboman/mason.nvim", - config = function() - require("mason-nvim-dap").setup({ ensure_installed = { "firefox", "node2" } }) - end, - }, - }, - config = function() - require("dap").adapters.node2 = { - type = "executable", - command = "node", - args = { - require("mason-registry").get_package("node-debug2-adapter"):get_install_path() - .. "/out/src/nodeDebug.js", - }, - } + "mfussenegger/nvim-dap", + keys = { + { + "", + function() + require("dap").toggle_breakpoint() + end, + }, + { + "", + function() + require("dap").continue() + end, + }, + }, + dependencies = { + { + "rcarriga/nvim-dap-ui", + config = function() + require("dapui").setup({ + layouts = { + { + elements = { "scopes", "watches", "stacks", "breakpoints" }, + size = require("wuelnerdotexe.plugin.util").get_sidebar_width(), + position = "left", + }, + { elements = { "console", "repl" }, size = 0.25, position = "bottom" }, + }, + }) + end, + }, + { + "jay-babu/mason-nvim-dap.nvim", + dependencies = "williamboman/mason.nvim", + config = function() + require("mason-nvim-dap").setup({ ensure_installed = { "firefox", "node2" } }) + end, + }, + }, + config = function() + require("dap").adapters.node2 = { + type = "executable", + command = "node", + args = { + require("mason-registry").get_package("node-debug2-adapter"):get_install_path() + .. "/out/src/nodeDebug.js", + }, + } - require("dap").adapters.firefox = { - type = "executable", - command = "node", - args = { - require("mason-registry").get_package("firefox-debug-adapter"):get_install_path() - .. "/dist/adapter.bundle.js", - }, - } + require("dap").adapters.firefox = { + type = "executable", + command = "node", + args = { + require("mason-registry").get_package("firefox-debug-adapter"):get_install_path() + .. "/dist/adapter.bundle.js", + }, + } - for _, language in pairs({ "javascript", "typescript" }) do - require("dap").configurations[language] = { - { - name = "Launch Node against current file", - type = "node2", - request = "launch", - program = "${file}", - cwd = vim.loop.cwd(), - sourceMaps = true, - protocol = "inspector", - console = "integratedTerminal", - }, - { - name = "Launch Node against pick process", - type = "node2", - request = "attach", - processId = require("dap.utils").pick_process, - console = "integratedTerminal", - }, - { - name = "Launch Firefox against localhost", - request = "launch", - type = "firefox", - reAttach = true, - url = "http://localhost:3000", - webRoot = "${workspaceFolder}", - console = "integratedTerminal", - }, - } - end + for _, language in pairs({ "javascript", "typescript" }) do + require("dap").configurations[language] = { + { + name = "Launch Node against current file", + type = "node2", + request = "launch", + program = "${file}", + cwd = vim.loop.cwd(), + sourceMaps = true, + protocol = "inspector", + console = "integratedTerminal", + }, + { + name = "Launch Node against pick process", + type = "node2", + request = "attach", + processId = require("dap.utils").pick_process, + console = "integratedTerminal", + }, + { + name = "Launch Firefox against localhost", + request = "launch", + type = "firefox", + reAttach = true, + url = "http://localhost:3000", + webRoot = "${workspaceFolder}", + console = "integratedTerminal", + }, + } + end - for _, language in pairs({ "javascriptreact", "typescriptreact" }) do - require("dap").configurations[language] = { - { - name = "Launch Firefox against localhost", - request = "launch", - type = "firefox", - reAttach = true, - url = "http://localhost:3000", - webRoot = "${workspaceFolder}", - console = "integratedTerminal", - }, - } - end + for _, language in pairs({ "javascriptreact", "typescriptreact" }) do + require("dap").configurations[language] = { + { + name = "Launch Firefox against localhost", + request = "launch", + type = "firefox", + reAttach = true, + url = "http://localhost:3000", + webRoot = "${workspaceFolder}", + console = "integratedTerminal", + }, + } + end - vim.api.nvim_call_function( - "sign_define", - { "DapBreakpoint", { linehl = "", text = "", texthl = "GitSignsDelete", numhl = "" } } - ) + vim.api.nvim_call_function( + "sign_define", + { "DapBreakpoint", { linehl = "", text = "", texthl = "GitSignsDelete", numhl = "" } } + ) - vim.api.nvim_call_function( - "sign_define", - { "DapBreakpointCondition", { linehl = "", text = "", texthl = "GitSignsDelete", numhl = "" } } - ) + vim.api.nvim_call_function( + "sign_define", + { "DapBreakpointCondition", { linehl = "", text = "", texthl = "GitSignsDelete", numhl = "" } } + ) - vim.api.nvim_call_function( - "sign_define", - { "DapLogPoint", { linehl = "", text = "", texthl = "GitSignsDelete", numhl = "" } } - ) + vim.api.nvim_call_function( + "sign_define", + { "DapLogPoint", { linehl = "", text = "", texthl = "GitSignsDelete", numhl = "" } } + ) - vim.api.nvim_call_function( - "sign_define", - { "DapStopped", { linehl = "GitSignsChangeLn", text = "", texthl = "GitSignsChange", numhl = "" } } - ) + vim.api.nvim_call_function( + "sign_define", + { "DapStopped", { linehl = "GitSignsChangeLn", text = "", texthl = "GitSignsChange", numhl = "" } } + ) - vim.api.nvim_call_function( - "sign_define", - { "DapBreakpointRejected", { linehl = "", text = "", texthl = "", numhl = "" } } - ) + vim.api.nvim_call_function( + "sign_define", + { "DapBreakpointRejected", { linehl = "", text = "", texthl = "", numhl = "" } } + ) - require("dap").listeners.after.event_initialized.dapui_config = function() - require("dapui").open() + require("dap").listeners.after.event_initialized.dapui_config = function() + require("dapui").open() - vim.api.nvim_set_keymap("n", "", "", { - callback = function() - require("dap").pause() - end, - }) - vim.api.nvim_set_keymap("n", "", "", { - callback = function() - require("dap").step_over() - end, - }) - vim.api.nvim_set_keymap("n", "", "", { - callback = function() - require("dap").step_into() - end, - }) - vim.api.nvim_set_keymap("n", "", "", { - callback = function() - require("dap").terminate() - end, - }) - vim.api.nvim_set_keymap("n", "", "", { - callback = function() - require("dap").run_last() - end, - }) - vim.api.nvim_set_keymap("n", "", "", { - callback = function() - require("dap").step_out() - end, - }) - vim.api.nvim_set_keymap("n", "", "", { - callback = function() - require("dap").step_into({ ask_for_targets = true }) - end, - }) - end + vim.api.nvim_set_keymap("n", "", "", { + callback = function() + require("dap").pause() + end, + }) + vim.api.nvim_set_keymap("n", "", "", { + callback = function() + require("dap").step_over() + end, + }) + vim.api.nvim_set_keymap("n", "", "", { + callback = function() + require("dap").step_into() + end, + }) + vim.api.nvim_set_keymap("n", "", "", { + callback = function() + require("dap").terminate() + end, + }) + vim.api.nvim_set_keymap("n", "", "", { + callback = function() + require("dap").run_last() + end, + }) + vim.api.nvim_set_keymap("n", "", "", { + callback = function() + require("dap").step_out() + end, + }) + vim.api.nvim_set_keymap("n", "", "", { + callback = function() + require("dap").step_into({ ask_for_targets = true }) + end, + }) + end - require("dap").listeners.before.event_exited.dapui_config = function() - require("dapui").close() + require("dap").listeners.before.event_exited.dapui_config = function() + require("dapui").close() - vim.api.nvim_del_keymap("n", "") - vim.api.nvim_del_keymap("n", "") - vim.api.nvim_del_keymap("n", "") - vim.api.nvim_del_keymap("n", "") -- S-F5 - vim.api.nvim_del_keymap("n", "") -- S-C-F5 - vim.api.nvim_del_keymap("n", "") -- S-F11 - vim.api.nvim_del_keymap("n", "") -- C-F11 - end + vim.api.nvim_del_keymap("n", "") + vim.api.nvim_del_keymap("n", "") + vim.api.nvim_del_keymap("n", "") + vim.api.nvim_del_keymap("n", "") -- S-F5 + vim.api.nvim_del_keymap("n", "") -- S-C-F5 + vim.api.nvim_del_keymap("n", "") -- S-F11 + vim.api.nvim_del_keymap("n", "") -- C-F11 + end - require("dap").listeners.before.event_terminated.dapui_config = function() - require("dapui").close() + require("dap").listeners.before.event_terminated.dapui_config = function() + require("dapui").close() - vim.api.nvim_del_keymap("n", "") - vim.api.nvim_del_keymap("n", "") - vim.api.nvim_del_keymap("n", "") - vim.api.nvim_del_keymap("n", "") -- S-F5 - vim.api.nvim_del_keymap("n", "") -- S-C-F5 - vim.api.nvim_del_keymap("n", "") -- S-F11 - vim.api.nvim_del_keymap("n", "") -- C-F11 - end - end, + vim.api.nvim_del_keymap("n", "") + vim.api.nvim_del_keymap("n", "") + vim.api.nvim_del_keymap("n", "") + vim.api.nvim_del_keymap("n", "") -- S-F5 + vim.api.nvim_del_keymap("n", "") -- S-C-F5 + vim.api.nvim_del_keymap("n", "") -- S-F11 + vim.api.nvim_del_keymap("n", "") -- C-F11 + end + end, } diff --git a/lua/plugins/config/lualine.lua b/lua/plugins/config/lualine.lua index 205bf30..afb9989 100644 --- a/lua/plugins/config/lualine.lua +++ b/lua/plugins/config/lualine.lua @@ -5,7 +5,7 @@ return { require('lualine').setup { options = { icons_enabled = true , - theme = "enfocado", + theme = "auto", section_separators = '', component_separators = '', refresh = { diff --git a/lua/plugins/config/null-ls.lua b/lua/plugins/config/null-ls.lua index 77415ea..768b616 100644 --- a/lua/plugins/config/null-ls.lua +++ b/lua/plugins/config/null-ls.lua @@ -1,5 +1,4 @@ -- Este plugin permite el auto save con Prettier y Eslint --- FIX: Comprobar cuando cargar el plugin si al iniciar o con un key return { "jose-elias-alvarez/null-ls.nvim", event = { "BufNewFile", "BufRead", "BufAdd" }, From 2b40b6ed1760dcf0c670eb28ec20e06d883bf9ff Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Mon, 12 Jun 2023 01:05:18 -0500 Subject: [PATCH 10/51] =?UTF-8?q?fix:=20modularizaci=C3=B3n=20de=20la=20co?= =?UTF-8?q?nfiguracion=20de=20lsp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/plugins/config/lsp/capabilities_lsp.lua | 20 +++ lua/plugins/config/lsp/config_lsp.lua | 139 +------------------- lua/plugins/config/lsp/servers_lsp.lua | 119 +++++++++++++++++ 3 files changed, 142 insertions(+), 136 deletions(-) create mode 100644 lua/plugins/config/lsp/capabilities_lsp.lua create mode 100644 lua/plugins/config/lsp/servers_lsp.lua diff --git a/lua/plugins/config/lsp/capabilities_lsp.lua b/lua/plugins/config/lsp/capabilities_lsp.lua new file mode 100644 index 0000000..e72524e --- /dev/null +++ b/lua/plugins/config/lsp/capabilities_lsp.lua @@ -0,0 +1,20 @@ +local M = {} + M.capabilities = require('cmp_nvim_lsp').default_capabilities( + vim.lsp.protocol.make_client_capabilities() + ) + M.on_attach = function(bufnr) + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'el', vim.diagnostic.setloclist, bufopts) + vim.keymap.set('n', 'er', vim.diagnostic.open_float, bufopts) + end + + M.lsp_flags = { + debounce_text_changes = 150, + } +return M diff --git a/lua/plugins/config/lsp/config_lsp.lua b/lua/plugins/config/lsp/config_lsp.lua index 2c4aa0c..b857960 100644 --- a/lua/plugins/config/lsp/config_lsp.lua +++ b/lua/plugins/config/lsp/config_lsp.lua @@ -1,13 +1,8 @@ ---NOTA: Este archivo debe ir en otra parte - --LSP Instaler -local nvim_lsp = require('lspconfig') - -- Set up completion using nvim_cmp with LSP source local capabilities = require('cmp_nvim_lsp').default_capabilities( vim.lsp.protocol.make_client_capabilities() ) - capabilities.textDocument.completion.completionItem.snippetSupport = true -- Mappings. @@ -17,143 +12,15 @@ vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) --- Use an on_attach function to only map the following keys --- after the language server attaches to the current buffer -local on_attach = function(client, bufnr) - -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'el', vim.diagnostic.setloclist, bufopts) - vim.keymap.set('n', 'er', vim.diagnostic.open_float, bufopts) -end - -local lsp_flags = { - -- This is the default in Nvim 0.7+ - debounce_text_changes = 150, -} - --Config Servers - ---Typescript, Javascript, JSX, TSX - -nvim_lsp.tsserver.setup { - capabilities = capabilities, - on_attach = on_attach, - flags = lsp_flags, -} - ---Go Server -nvim_lsp.gopls.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = lsp_flags, - dap_debug = true, - dap_debug_gui = true -} - ---Astro server -nvim_lsp['astro'].setup { - capabilities = capabilities, - on_attach = on_attach, - flags = lsp_flags, -} - ----CSS Modules -require('lspconfig')['cssmodules_ls'].setup { - on_attach = on_attach, - flags = lsp_flags, - filetypes = { - "javascript", "javascriptreact", "typescript", "typescriptreact" - } -} - -require('lspconfig')['cssls'].setup { - on_attach = on_attach, - flags = lsp_flags, - filetypes = { - "css", "scss", "less" - }, - settings = { - css = { - validate = true - }, - less = { - validate = true - }, - scss = { - validate = true - } - }, - single_file_support = true, -} - --- Html Server -require('lspconfig')['html'].setup { - on_attach = on_attach, - flags = lsp_flags, - embeddedLanguages = { - css = true, - javascript = true - }, - providerFormatter = true, - single_file_support = true, -} - ---Vim Server -require('lspconfig')['vimls'].setup {} - -require('lspconfig')['lua_ls'].setup { - on_attach = on_attach, - flags = lsp_flags, - format = {enable = true} -} - ---ESLINT Server Config -require("lspconfig").eslint.setup({ - on_attach = on_attach, - flags = lsp_flags, - settings = { format = false }, -}) - ---- StyleLint Config -require('lspconfig')['stylelint_lsp'].setup { - filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'less', 'astro' }, - capabilities = capabilities, - handlers = handlers, - on_attach = on_attach, - settings = { - autoFixOnSave = true, - autoFixOnFormat = true, - validateOnType = true - -- other settings... - } -} - ---JSON Lenguaje -require('lspconfig')['jsonls'].setup { - on_attach = on_attach, - flags = lsp_flags, -} - --- Tailwind --- require("lspconfig").tailwindcss.setup({ --- on_attach = on_attach, --- flags = lsp_flags, --- capabilities = capabilities, ---}) - +require('plugins.config.lsp.servers_lsp') -- Diagnosticos de LSP vim.diagnostic.config({ --underline = true, - virtual_text = false, + virtual_text = false, update_in_insert = false, - severity_sort = false, + severity_sort = false, float = { border = 'rounded', source = 'always', diff --git a/lua/plugins/config/lsp/servers_lsp.lua b/lua/plugins/config/lsp/servers_lsp.lua new file mode 100644 index 0000000..4dcf189 --- /dev/null +++ b/lua/plugins/config/lsp/servers_lsp.lua @@ -0,0 +1,119 @@ + +local nvim_lsp = require('lspconfig') + +local capabilities, on_attach, lsp_flags = require('plugins.config.lsp.capabilities_lsp') + +nvim_lsp['tsserver'].setup { + capabilities = capabilities, + on_attach = on_attach, + flags = lsp_flags, +} + +--Go Server +--nvim_lsp.gopls.setup { +-- on_attach = on_attach, +-- capabilities = capabilities, +-- flags = lsp_flags, +-- dap_debug = true, +-- dap_debug_gui = true +--} + +--Java Server +nvim_lsp['jdtls'].setup { + capabilities = capabilities, + on_attach = on_attach, + cmd = { 'jdtls' } +} + + +--Astro server +nvim_lsp['astro'].setup { + capabilities = capabilities, + on_attach = on_attach, + flags = lsp_flags, +} + +---CSS Modules +nvim_lsp['cssmodules_ls'].setup { + on_attach = on_attach, + flags = lsp_flags, + filetypes = { + "javascript", "javascriptreact", "typescript", "typescriptreact" + } +} + +nvim_lsp['cssls'].setup { + on_attach = on_attach, + flags = lsp_flags, + filetypes = { + "css", "scss", "less" + }, + settings = { + css = { + validate = true + }, + less = { + validate = true + }, + scss = { + validate = true + } + }, + single_file_support = true, +} + +-- Html Server +nvim_lsp['html'].setup { + on_attach = on_attach, + flags = lsp_flags, + embeddedLanguages = { + css = true, + javascript = true + }, + providerFormatter = true, + single_file_support = true, +} + +--Vim Server +nvim_lsp['vimls'].setup {} + +nvim_lsp['lua_ls'].setup { + on_attach = on_attach, + flags = lsp_flags, + format = {enable = true} +} + +--ESLINT Server Config +nvim_lsp.eslint.setup({ + on_attach = on_attach, + flags = lsp_flags, + settings = { format = false }, +}) + +--- StyleLint Config +nvim_lsp['stylelint_lsp'].setup { + filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'less', 'astro' }, + capabilities = capabilities, + on_attach = on_attach, + settings = { + autoFixOnSave = true, + autoFixOnFormat = true, + validateOnType = true + -- other settings... + } +} + +--JSON Lenguaje +nvim_lsp['jsonls'].setup { + on_attach = on_attach, + flags = lsp_flags, +} + +-- Tailwind +-- require("lspconfig").tailwindcss.setup({ +-- on_attach = on_attach, +-- flags = lsp_flags, +-- capabilities = capabilities, +--}) + + From 0fa376b2600ccea10fa75bba0c9e8ee2930f44b2 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Mon, 12 Jun 2023 01:06:17 -0500 Subject: [PATCH 11/51] fix: se volvio a colocar el plugin `neo-tree` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Por errores con Mason se volvio a colocar el plugin Neo tree, daba errores al iniciar la ventana de instalación --- lua/core/keys.lua | 6 +++--- lua/plugins/{misc => config}/neo-tree.lua | 0 lua/plugins/config/telescope.lua | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) rename lua/plugins/{misc => config}/neo-tree.lua (100%) diff --git a/lua/core/keys.lua b/lua/core/keys.lua index f59208c..50cc727 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -68,7 +68,7 @@ a.nvim_set_keymap('n', 'of', 'lua require(\'telescope.builtin\').ol -- Lista buffers o pestañas abiertos a.nvim_set_keymap('n', 'b', 'lua require(\'telescope.builtin\').buffers()', { noremap = true }) -a.nvim_set_keymap('n', 'p', "lua require 'telescope'.extensions.file_browser.file_browser()", {noremap = true}) +--a.nvim_set_keymap('n', 'p', "lua require 'telescope'.extensions.file_browser.file_browser()", {noremap = true}) ------ -- Todo Busqueda telescope a.nvim_set_keymap('n', 'td', ':TodoTelescope', {}) @@ -101,5 +101,5 @@ a.nvim_set_keymap('n', 'ds', ':DapTerminate', { noremap = true }) a.nvim_set_keymap('n', 'du', ':lua require("dapui").toggle()', { noremap = true }) -- Neotree ---a.nvim_set_keymap('n', 'p', ':NeoTreeFocusToggle', { noremap = true }) ---a.nvim_set_keymap('n', 'g', ':NeoTreeFocusToggle git_status', { noremap = true }) +a.nvim_set_keymap('n', 'p', ':NeoTreeFocusToggle', { noremap = true }) +a.nvim_set_keymap('n', 'g', ':NeoTreeFocusToggle git_status', { noremap = true }) diff --git a/lua/plugins/misc/neo-tree.lua b/lua/plugins/config/neo-tree.lua similarity index 100% rename from lua/plugins/misc/neo-tree.lua rename to lua/plugins/config/neo-tree.lua diff --git a/lua/plugins/config/telescope.lua b/lua/plugins/config/telescope.lua index 1cc3b47..a35d7c0 100644 --- a/lua/plugins/config/telescope.lua +++ b/lua/plugins/config/telescope.lua @@ -3,10 +3,10 @@ return { dependencies = { { "nvim-lua/plenary.nvim" }, { "nvim-tree/nvim-web-devicons" }, - {"nvim-telescope/telescope-file-browser.nvim"} + --{"nvim-telescope/telescope-file-browser.nvim"} }, config = function() - local fb_actions = require("telescope._extensions.file_browser.actions") + --local fb_actions = require("telescope._extensions.file_browser.actions") require('telescope').setup { initial_mode = "insert", defaults = { @@ -47,6 +47,7 @@ return { } }, extensions = { +--[[ file_browser = { initial_mode = "normal", defaults = { @@ -79,9 +80,12 @@ return { } } }, + ]] } } + --[[ require("telescope").load_extension "file_browser" vim.cmd("autocmd VimEnter * :Telescope file_browser") + ]] end } From 5db334562d3dc323a86b544dddd742133890396c Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Mon, 12 Jun 2023 01:31:01 -0500 Subject: [PATCH 12/51] fix: corregido el error de el server null-ls de go --- lua/plugins/config/null-ls.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/plugins/config/null-ls.lua b/lua/plugins/config/null-ls.lua index 768b616..accc190 100644 --- a/lua/plugins/config/null-ls.lua +++ b/lua/plugins/config/null-ls.lua @@ -9,7 +9,7 @@ return { dependencies = "williamboman/mason.nvim", config = function() require("mason-null-ls").setup({ - ensure_installed = { "jsonlint", "prettierd", "gofumpt", "goimports", "selene" }, + ensure_installed = { "jsonlint", "prettierd", "selene" }, }) end, }, @@ -38,8 +38,8 @@ return { sources = { null_ls.builtins.diagnostics.jsonlint, null_ls.builtins.diagnostics.selene, - null_ls.builtins.formatting.gofumpt, - null_ls.builtins.formatting.goimports, + --null_ls.builtins.formatting.gofumpt, + --null_ls.builtins.formatting.goimports, --require("null-ls").builtins.diagnostics.markdownlint, null_ls.builtins.formatting.prettierd.with({ condition = function(utils) From 5dee1093e447a3ef4765d0c800e79270454405c9 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 11 Jul 2023 20:26:46 -0500 Subject: [PATCH 13/51] feat: se agrego el clipboard para wsl --- lua/core/settings-clipwsl.lua | 14 ++++++++++++++ lua/core/settings.lua | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 lua/core/settings-clipwsl.lua diff --git a/lua/core/settings-clipwsl.lua b/lua/core/settings-clipwsl.lua new file mode 100644 index 0000000..c09b743 --- /dev/null +++ b/lua/core/settings-clipwsl.lua @@ -0,0 +1,14 @@ +--Permite Copiar y pegar por fuera y por dentro en WSL2 +local g = vim.g +g.clipboard = { + name = 'WslClipboard', + copy = { + ['+'] = 'clip.exe', + ['*'] = 'clip.exe', + }, + paste = { + ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + }, + cache_enabled = 0, +} diff --git a/lua/core/settings.lua b/lua/core/settings.lua index 33c41ac..3e76160 100644 --- a/lua/core/settings.lua +++ b/lua/core/settings.lua @@ -9,6 +9,9 @@ g.mapleader = " " opt.encoding = "utf-8" opt.mouse = "" opt.clipboard = "unnamedplus" +-- clipboard WSL +require('core.settings-clipwsl') + opt.errorbells = false opt.list = false opt.cmdheight = 1 From 89909c50101db341bf04200b5f7fd95c3bb0d5d8 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 11 Jul 2023 20:27:14 -0500 Subject: [PATCH 14/51] chore(*): update-package `lazy-lock` --- lazy-lock.json | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f578379..540d9f7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,50 +1,51 @@ { - "LuaSnip": { "branch": "master", "commit": "a13af80734eb28f744de6c875330c9d3c24b5f3b" }, + "LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, - "cmp-emmet": { "branch": "main", "commit": "1b29294e9126c493a28b4b967c227edd77ed04d3" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-emmet": { "branch": "main", "commit": "1056875c29747ca6ca82ebf3dc434619604ebc2f" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, - "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" }, - "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, - "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" }, + "friendly-snippets": { "branch": "main", "commit": "ca668b7a4a2913ad1109b5e4aaf0013651956b13" }, + "gitsigns.nvim": { "branch": "main", "commit": "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, + "lazy.nvim": { "branch": "main", "commit": "da8b00581a52f5f87ad2aba9f52171fda7491f18" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "54d702020bf94e4eefd357f0b738317af30217eb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "796008869e67ef27a5aa5ac44c08ce2a60b89f55" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, - "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" }, + "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, - "nerdcommenter": { "branch": "master", "commit": "b0b09ea46c9f0509556257bd8b838b40f493d6a0" }, + "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, - "npairs-integrate-upair": { "branch": "main", "commit": "ee1bb41280d20868b31ce5c1c68e8fdadc70b70a" }, - "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" }, - "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" }, - "nvim-cmp": { "branch": "main", "commit": "69e7d280cbe17e318b549a10ae3cae5810946be6" }, + "npairs-integrate-upair": { "branch": "main", "commit": "727ecc0c3e1ac9e5a5988b240325b274a75b9ac2" }, + "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, + "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, + "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" }, + "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" }, + "nvim-dap": { "branch": "master", "commit": "3bde6f786057fa29d8356559b2ae3a52d9317fba" }, "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, - "nvim-lspconfig": { "branch": "master", "commit": "08f1f347c718e945c3b1712ebb68c6834182cf3a" }, - "nvim-treesitter": { "branch": "master", "commit": "f9d701176cb9a3e206a4c690920a8993630c3ec8" }, - "nvim-ts-autotag": { "branch": "main", "commit": "40615e96075c743ef47aaf9de966dc348bec6459" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "e1783c843fd0a604d071cb9f0c6919ac93bcd96e" }, - "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, - "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" }, - "telescope.nvim": { "branch": "master", "commit": "116dbea5800c908de4afa6e793f28f782621c65d" }, + "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" }, + "nvim-treesitter": { "branch": "master", "commit": "b4b94ec387525cb9df4b56eb1a8bf33231a0df47" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, + "nvim-ts-rainbow2": { "branch": "master", "commit": "d2ea7b31b805cf4b7a05d032d0ec9d356345d3df" }, + "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, + "plenary.nvim": { "branch": "master", "commit": "bda256fab0eb66a15e8190937e417e6a14ee5d72" }, + "telescope.nvim": { "branch": "master", "commit": "276362a8020c6e94c7a76d49aa00d4923b0c02f3" }, "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, - "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" }, + "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" }, "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" }, "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, - "vim-enfocado": { "branch": "main", "commit": "352a16183173a86b9e06c22aa30ca14f5da3f62d" }, - "vim-fugitive": { "branch": "master", "commit": "5f0d280b517cacb16f59316659966c7ca5e2bea2" }, + "vim-enfocado": { "branch": "main", "commit": "d728a74a80c29476f6e5e2ce52dbe82bbbccd12e" }, + "vim-fugitive": { "branch": "master", "commit": "43f18ab9155c853a84ded560c6104e6300ad41da" }, "vim-move": { "branch": "master", "commit": "244a2908ffbca3d09529b3ec24c2c090f489f401" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" } From a1290179b86d0b9e417a7ed68d3aa508c394f950 Mon Sep 17 00:00:00 2001 From: Fabian Molina <54122486+fabianmolinab@users.noreply.github.com> Date: Tue, 11 Jul 2023 20:44:56 -0500 Subject: [PATCH 15/51] feat: Create README.md #3 --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..c9e4c54 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# Mi configuración personal de NeoVim +## Requerimientos + +- [Nerd Fonts](https://www.nerdfonts.com/) [codicons.ttf](https://github.com/microsoft/vscode-codicons) - tipografia con los mejores iconos. +- [Neovim](https://neovim.io/) >= v0.8. +- [Git](https://git-scm.com/) - para instalar los complementos con [lazy.nvim](https://github.com/folke/lazy.nvim). +- [Node](https://nodejs.org/) y [NPM](https://www.npmjs.com/package/npm) - para instalar los servidores de lenguajes, debuguers, linters, etc [mason.nvim](https://github.com/williamboman/mason.nvim). +- [ripgrep (rg)](https://github.com/BurntSushi/ripgrep) - para las busquedas por palabras [nvim-telescope](https://github.com/nvim-telescope/telescope.nvim). +- [fd](https://github.com/sharkdp/fd) - para buscar archivos con [nvim-telescope](https://github.com/nvim-telescope/telescope.nvim). From ae300d0d2f46f3aa35123f98e75aa816d9297105 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Fri, 14 Jul 2023 10:31:42 -0500 Subject: [PATCH 16/51] =?UTF-8?q?fix:=20se=20creo=20la=20carpeta=20setting?= =?UTF-8?q?s=20con=20nuevo=20modulo=20Se=20creo=20una=20nueva=20carpeta=20?= =?UTF-8?q?donde=20estaran=20todas=20configuraciones=20de=20=C2=B4core/set?= =?UTF-8?q?tings/*=C2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/core/{settings-clipwsl.lua => settings/clipwsl.lua} | 0 lua/core/{settings.lua => settings/init.lua} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename lua/core/{settings-clipwsl.lua => settings/clipwsl.lua} (100%) rename lua/core/{settings.lua => settings/init.lua} (93%) diff --git a/lua/core/settings-clipwsl.lua b/lua/core/settings/clipwsl.lua similarity index 100% rename from lua/core/settings-clipwsl.lua rename to lua/core/settings/clipwsl.lua diff --git a/lua/core/settings.lua b/lua/core/settings/init.lua similarity index 93% rename from lua/core/settings.lua rename to lua/core/settings/init.lua index 3e76160..1afa5a7 100644 --- a/lua/core/settings.lua +++ b/lua/core/settings/init.lua @@ -9,8 +9,8 @@ g.mapleader = " " opt.encoding = "utf-8" opt.mouse = "" opt.clipboard = "unnamedplus" --- clipboard WSL -require('core.settings-clipwsl') +-- Copiar y pegar en WSL +require('core.settings.clipwsl') opt.errorbells = false opt.list = false From 1cbd592d048bd29b9398bb6f38611ed121fb2fa1 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sat, 15 Jul 2023 12:05:48 -0500 Subject: [PATCH 17/51] chore: nuevo archivo de variables globales --- globals.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 globals.lua diff --git a/globals.lua b/globals.lua new file mode 100644 index 0000000..31b7208 --- /dev/null +++ b/globals.lua @@ -0,0 +1,11 @@ +-- Este archivo define variables globales utilizadas en todo el proyecto. + +local opt = vim.opt +local g = vim.g +local a = vim.api + +return { + opt = opt, + g = g, + a = a +} From 5458655a94a5265e8fb4971415d3dfabbf816fc6 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Mon, 17 Jul 2023 09:19:28 -0500 Subject: [PATCH 18/51] fix: corregido error de configuracion de dapui --- lua/plugins/config/dap.lua | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lua/plugins/config/dap.lua b/lua/plugins/config/dap.lua index ff2c69c..c20f76f 100644 --- a/lua/plugins/config/dap.lua +++ b/lua/plugins/config/dap.lua @@ -19,14 +19,6 @@ return { "rcarriga/nvim-dap-ui", config = function() require("dapui").setup({ - layouts = { - { - elements = { "scopes", "watches", "stacks", "breakpoints" }, - size = require("wuelnerdotexe.plugin.util").get_sidebar_width(), - position = "left", - }, - { elements = { "console", "repl" }, size = 0.25, position = "bottom" }, - }, }) end, }, From bf32c12aa4816be421a388bdbb4616db31e66ed0 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Mon, 17 Jul 2023 11:25:55 -0500 Subject: [PATCH 19/51] chore(*): update-package `lazy-lock` --- lazy-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/lazy-lock.json b/lazy-lock.json index 540d9f7..fac8b11 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -32,6 +32,7 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "3bde6f786057fa29d8356559b2ae3a52d9317fba" }, "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, + "nvim-jdtls": { "branch": "master", "commit": "96e3978c3fdae3950f6ccda548775e8b8952f74a" }, "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" }, "nvim-treesitter": { "branch": "master", "commit": "b4b94ec387525cb9df4b56eb1a8bf33231a0df47" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, From 0f226c90d0247d2610fabfb946b0f3e90ea55ff0 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Mon, 17 Jul 2023 22:51:42 -0500 Subject: [PATCH 20/51] =?UTF-8?q?chore(*):=20Eliminaci=C3=B3n=20de=20?= =?UTF-8?q?=C2=B4docs/*=C2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/estructura.md | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 docs/estructura.md diff --git a/docs/estructura.md b/docs/estructura.md deleted file mode 100644 index 57c041d..0000000 --- a/docs/estructura.md +++ /dev/null @@ -1,22 +0,0 @@ -Esta es la estructura inicial la iré cambiando con el tiempo - -``` -📁 nvim -├── 📁 core -│ ├── 📄 colors.lua -│ ├── 📄 keys.lua -│ └── 📄 settings.lua -├── 📁 plugins -│ └─ 📁 configs -│ └─ init.lua -├── 📁 themes -│ ├── 📄 ayu.lua -├── .gitignore -└── 📄 init.lua -``` - -- **core/**: Esta carpeta contiene archivos relacionados con la configuración general de Neovim, como ajustes de colores, atajos de teclado, configuración de plugins, y la línea de estado. - -- **plugins/**: Aquí se encuentran los archivos de configuración específicos. - -- **themes/**: En esta carpeta se almacenan los archivos de configuración de temas. From d30f0fe160f65071169953c6aa0e19289fc40f0e Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Wed, 19 Jul 2023 21:10:23 -0500 Subject: [PATCH 21/51] fix: se movio la carpeta globals por errores --- globals.lua | 11 ----------- lua/globals.lua | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 globals.lua create mode 100644 lua/globals.lua diff --git a/globals.lua b/globals.lua deleted file mode 100644 index 31b7208..0000000 --- a/globals.lua +++ /dev/null @@ -1,11 +0,0 @@ --- Este archivo define variables globales utilizadas en todo el proyecto. - -local opt = vim.opt -local g = vim.g -local a = vim.api - -return { - opt = opt, - g = g, - a = a -} diff --git a/lua/globals.lua b/lua/globals.lua new file mode 100644 index 0000000..a3de738 --- /dev/null +++ b/lua/globals.lua @@ -0,0 +1,19 @@ +-- Este archivo define variables globales utilizadas en todo el proyecto. + +local opt = vim.opt +local cmd = vim.cmd +local g = vim.g +local a = vim.api +local key = vim.keymap +local lsp = vim.lsp +local vim = vim + +return { + opt = opt, + cmd = cmd, + g = g, + a = a, + key = key, + lsp = lsp, + vim = vim +} From 8e6773f0a626111851a3cd41c10091cf9e09d8d8 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Wed, 19 Jul 2023 21:11:20 -0500 Subject: [PATCH 22/51] chore: se cambiaron las variables globales Se cambiaron todas las variables globales en todos los archivos para evitar errores por sintaxis --- lua/core/colors.lua | 13 ++++++------- lua/core/keys.lua | 3 ++- lua/core/settings/clipwsl.lua | 5 +++-- lua/plugins/config/autopairs.lua | 3 ++- lua/plugins/config/black-indent.lua | 3 ++- lua/plugins/config/cmp.lua | 19 ++++++++++--------- lua/plugins/config/colorizer.lua | 1 - lua/plugins/config/dap.lua | 2 ++ lua/plugins/config/easy-motion.lua | 3 ++- lua/plugins/config/lsp/capabilities_lsp.lua | 16 +++++++++------- lua/plugins/config/lsp/config_lsp.lua | 4 +++- lua/plugins/config/lsp/servers_lsp.lua | 2 -- lua/plugins/config/markdown-preview.lua | 13 ++++++++----- lua/plugins/config/null-ls.lua | 11 +++++++---- lua/plugins/config/web-devicons.lua | 4 +++- lua/plugins/misc/bufferline.lua | 4 +++- 16 files changed, 62 insertions(+), 44 deletions(-) diff --git a/lua/core/colors.lua b/lua/core/colors.lua index 0eb0e19..880f0ad 100644 --- a/lua/core/colors.lua +++ b/lua/core/colors.lua @@ -1,12 +1,11 @@ -local opt = vim.opt - +local globals = require('globals') -- Configurar termguicolors y background -opt.termguicolors = true -opt.background = "dark" +globals.opt.termguicolors = true +globals.opt.background = 'dark' -- Configurar cursorline y cursorlineopt -opt.cursorline = true -opt.cursorlineopt = 'number' +globals.opt.cursorline = true +globals.opt.cursorlineopt = 'number' -- Configurar menú de autocompletado a trasparente -vim.cmd('highlight Pmenu guifg=#dee1e4 guibg=none') +globals.cmd('highlight Pmenu guifg=#dee1e4 guibg=none') diff --git a/lua/core/keys.lua b/lua/core/keys.lua index 50cc727..683e8a9 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -1,4 +1,5 @@ -local a = vim.api +local globals = require('globals') +local a = globals.a -- Deshabilita la navegación con las flechas a.nvim_set_keymap('n', '', '', { noremap = true }) diff --git a/lua/core/settings/clipwsl.lua b/lua/core/settings/clipwsl.lua index c09b743..7a2a358 100644 --- a/lua/core/settings/clipwsl.lua +++ b/lua/core/settings/clipwsl.lua @@ -1,6 +1,7 @@ --Permite Copiar y pegar por fuera y por dentro en WSL2 -local g = vim.g -g.clipboard = { +local globals = require('globals') + +globals.g.clipboard = { name = 'WslClipboard', copy = { ['+'] = 'clip.exe', diff --git a/lua/plugins/config/autopairs.lua b/lua/plugins/config/autopairs.lua index 686c870..2c09f4e 100644 --- a/lua/plugins/config/autopairs.lua +++ b/lua/plugins/config/autopairs.lua @@ -1,4 +1,5 @@ local mode = { "i", "c" } +local globals = require('globals') return { "altermo/npairs-integrate-upair", @@ -23,7 +24,7 @@ return { { "altermo/ultimate-autopair.nvim", dependencies = "nvim-treesitter/nvim-treesitter" }, }, init = function() - vim.api.nvim_create_autocmd("User", { + globals.a.nvim_create_autocmd("User", { pattern = "IntPairsComp", callback = function() if not package.loaded["npairs-int-upair"] then diff --git a/lua/plugins/config/black-indent.lua b/lua/plugins/config/black-indent.lua index 729867b..925aca4 100644 --- a/lua/plugins/config/black-indent.lua +++ b/lua/plugins/config/black-indent.lua @@ -1,11 +1,12 @@ local open_file_event = { "BufNewFile", "BufRead", "BufAdd", "SessionLoadPost" } +local globals = require('globals') return { "lukas-reineke/indent-blankline.nvim", depedencies = "nvim-treesitter/nvim-treesitter", event = open_file_event, config = function() --vim.cmd [[highlight IndentBlanklineIndent guifg=#22262F ]] - vim.opt.list = true + globals.opt.list = true --vim.opt.listchars:append "trail:●" --vim.opt.listchars:append "space:·" --vim.opt.listchars:append "eol:↓" diff --git a/lua/plugins/config/cmp.lua b/lua/plugins/config/cmp.lua index 6663594..3cf8d7b 100644 --- a/lua/plugins/config/cmp.lua +++ b/lua/plugins/config/cmp.lua @@ -1,3 +1,4 @@ +local globals = require('globals') return { { "hrsh7th/nvim-cmp", @@ -8,12 +9,12 @@ return { }, config = function() - vim.o.completeopt = "menu,menuone,noselect" + globals.opt.completeopt = "menu,menuone,noselect" local has_words_before = function() unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil + local line, col = unpack(globals.a.nvim_win_get_cursor(0)) + return col ~= 0 and globals.a.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil end local cmp = require 'cmp' @@ -80,9 +81,9 @@ return { option = { get_bufnrs = function() local bufs = {} - for _, win in ipairs(vim.api.nvim_list_wins()) do - local bufnr = vim.api.nvim_win_get_buf(win) - if vim.api.nvim_buf_get_option(bufnr, 'buftype') ~= 'terminal' then + for _, win in ipairs(globals.a.nvim_list_wins()) do + local bufnr = globals.a.nvim_win_get_buf(win) + if globals.a.nvim_buf_get_option(bufnr, 'buftype') ~= 'terminal' then bufs[bufnr] = true end end @@ -115,10 +116,10 @@ return { cmp_autopairs.on_confirm_done() ) -- Configuración de altura de ventanas flotantes - vim.opt.pumheight = 10 - vim.opt.cmdwinheight = 10 + globals.opt.pumheight = 10 + globals.opt.cmdwinheight = 10 - vim.cmd [[highlight! default link CmpItemKind CmpItemMenuDefault]] + globals.cmd [[highlight! default link CmpItemKind CmpItemMenuDefault]] end, }, { "hrsh7th/cmp-buffer", event = "InsertEnter", dependencies = "hrsh7th/nvim-cmp" }, diff --git a/lua/plugins/config/colorizer.lua b/lua/plugins/config/colorizer.lua index 2d5bd1b..4982a2e 100644 --- a/lua/plugins/config/colorizer.lua +++ b/lua/plugins/config/colorizer.lua @@ -1,5 +1,4 @@ --Plugin para colorear Hexadecimales - return { "norcalli/nvim-colorizer.lua", diff --git a/lua/plugins/config/dap.lua b/lua/plugins/config/dap.lua index c20f76f..67897e4 100644 --- a/lua/plugins/config/dap.lua +++ b/lua/plugins/config/dap.lua @@ -1,3 +1,5 @@ +local globals = require('globals') +local vim = globals.vim return { "mfussenegger/nvim-dap", keys = { diff --git a/lua/plugins/config/easy-motion.lua b/lua/plugins/config/easy-motion.lua index 31069c5..6702e4c 100644 --- a/lua/plugins/config/easy-motion.lua +++ b/lua/plugins/config/easy-motion.lua @@ -1,3 +1,4 @@ +local globals = require('globals') return { "easymotion/vim-easymotion", lazy = true, @@ -5,6 +6,6 @@ return { { "f", "(easymotion-s2)", desc = "easymotion" } }, config = function() - vim.g.EasyMotion_smartcase = 1 + globals.g.EasyMotion_smartcase = 1 end } diff --git a/lua/plugins/config/lsp/capabilities_lsp.lua b/lua/plugins/config/lsp/capabilities_lsp.lua index e72524e..5232cc7 100644 --- a/lua/plugins/config/lsp/capabilities_lsp.lua +++ b/lua/plugins/config/lsp/capabilities_lsp.lua @@ -1,17 +1,19 @@ local M = {} + local globals = require('globals') M.capabilities = require('cmp_nvim_lsp').default_capabilities( - vim.lsp.protocol.make_client_capabilities() + globals.lsp.protocol.make_client_capabilities() ) M.on_attach = function(bufnr) - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + globals.a.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') -- Mappings. local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'el', vim.diagnostic.setloclist, bufopts) - vim.keymap.set('n', 'er', vim.diagnostic.open_float, bufopts) + globals.key.set('n', 'gD', globals.v.lsp.buf.declaration, bufopts) + globals.key.set('n', 'gd', globals.lsp.buf.definition, bufopts) + globals.keymap.set('n', 'K', globals.lsp.buf.hover, bufopts) + globals.keymap.set('n', 'el', globals.v.diagnostic.setloclist, bufopts) + globals.keymap.set('n', 'er', globals.v.diagnostic.open_float, bufopts) end M.lsp_flags = { diff --git a/lua/plugins/config/lsp/config_lsp.lua b/lua/plugins/config/lsp/config_lsp.lua index b857960..fe88b9e 100644 --- a/lua/plugins/config/lsp/config_lsp.lua +++ b/lua/plugins/config/lsp/config_lsp.lua @@ -1,7 +1,9 @@ --LSP Instaler -- Set up completion using nvim_cmp with LSP source +-- +local globals = require('globals') local capabilities = require('cmp_nvim_lsp').default_capabilities( - vim.lsp.protocol.make_client_capabilities() + globals.lsp.protocol.make_client_capabilities() ) capabilities.textDocument.completion.completionItem.snippetSupport = true diff --git a/lua/plugins/config/lsp/servers_lsp.lua b/lua/plugins/config/lsp/servers_lsp.lua index 4dcf189..25949a3 100644 --- a/lua/plugins/config/lsp/servers_lsp.lua +++ b/lua/plugins/config/lsp/servers_lsp.lua @@ -1,6 +1,4 @@ - local nvim_lsp = require('lspconfig') - local capabilities, on_attach, lsp_flags = require('plugins.config.lsp.capabilities_lsp') nvim_lsp['tsserver'].setup { diff --git a/lua/plugins/config/markdown-preview.lua b/lua/plugins/config/markdown-preview.lua index 6edb442..14bb4fb 100644 --- a/lua/plugins/config/markdown-preview.lua +++ b/lua/plugins/config/markdown-preview.lua @@ -1,12 +1,15 @@ +local globals = require('globals') +--vim.api +local vim = globals.a return { "iamcco/markdown-preview.nvim", build = "cd app && npm install", ft = "markdown", init = function() - vim.api.nvim_set_var("mkdp_auto_close", 0) - vim.api.nvim_set_var("mkdp_refresh_slow", 1) - vim.api.nvim_set_var("mkdp_browser", "firefox") - vim.api.nvim_set_var("mkdp_echo_preview_url", 1) - vim.api.nvim_set_var("mkdp_theme", "dark") + vim.nvim_set_var("mkdp_auto_close", 0) + vim.nvim_set_var("mkdp_refresh_slow", 1) + vim.nvim_set_var("mkdp_browser", "firefox") + vim.nvim_set_var("mkdp_echo_preview_url", 1) + vim.nvim_set_var("mkdp_theme", "dark") end, } diff --git a/lua/plugins/config/null-ls.lua b/lua/plugins/config/null-ls.lua index accc190..e1aebf6 100644 --- a/lua/plugins/config/null-ls.lua +++ b/lua/plugins/config/null-ls.lua @@ -1,4 +1,7 @@ -- Este plugin permite el auto save con Prettier y Eslint +local globals = require('globals') +local vim = globals.vim + return { "jose-elias-alvarez/null-ls.nvim", event = { "BufNewFile", "BufRead", "BufAdd" }, @@ -17,19 +20,19 @@ return { config = function() local null_ls = require("null-ls") - local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) + local augroup = globals.a.nvim_create_augroup("LspFormatting", {}) null_ls.setup({ update_in_insert = vim.diagnostic.config().update_in_insert, debounce = 300, on_attach = function(client, bufnr) if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { + globals.a.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + globals.a.nvim_create_autocmd("BufWritePre", { group = augroup, buffer = bufnr, callback = function() - vim.lsp.buf.format({ bufnr = bufnr }) + globals.lsp.buf.format({ bufnr = bufnr }) require("luasnip").session.current_nodes[bufnr] = nil end, }) diff --git a/lua/plugins/config/web-devicons.lua b/lua/plugins/config/web-devicons.lua index d64dcfd..16c77fa 100644 --- a/lua/plugins/config/web-devicons.lua +++ b/lua/plugins/config/web-devicons.lua @@ -1,7 +1,9 @@ +local globals = require('globals') + return { 'nvim-tree/nvim-web-devicons', config = function() - if vim.g.loaded_devicons == nil then + if globals.g.loaded_devicons == nil then return end diff --git a/lua/plugins/misc/bufferline.lua b/lua/plugins/misc/bufferline.lua index 57cf10a..5154ed6 100644 --- a/lua/plugins/misc/bufferline.lua +++ b/lua/plugins/misc/bufferline.lua @@ -2,7 +2,9 @@ return { 'akinsho/bufferline.nvim', dependencies = 'nvim-tree/nvim-web-devicons', config = function () - vim.opt.termguicolors = true + local globals = require('globals') + globals.opt.termguicolors = true + require("bufferline").setup({ options = { buffer_close_icon = '', From 22a7ae67f9ea9b28df7af2b1b3dbfe01e703c710 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Wed, 19 Jul 2023 21:12:19 -0500 Subject: [PATCH 23/51] style: se cambio el estilo del tema enfocado --- lua/themes/enfocado.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/themes/enfocado.lua b/lua/themes/enfocado.lua index dbddf6e..f87e3fe 100644 --- a/lua/themes/enfocado.lua +++ b/lua/themes/enfocado.lua @@ -1,10 +1,11 @@ +local globals = require('globals') return { "wuelnerdotexe/vim-enfocado", lazy = false, enabled = true, priority = 1000, init = function() - vim.api.nvim_set_var("enfocado_plugins", { + globals.a.nvim_set_var("enfocado_plugins", { "aerial", "bufferline", "cmp", @@ -27,17 +28,16 @@ return { "visual-multi", "yanky", }) - - vim.api.nvim_create_autocmd("ColorScheme", { + globals.a.nvim_create_autocmd("ColorScheme", { pattern = "enfocado", callback = function() - vim.api.nvim_command("highlight Type cterm=NONE gui=NONE") - vim.api.nvim_command("highlight TypeBuiltin cterm=NONE gui=NONE") + globals.a.nvim_command("highlight Type cterm=NONE gui=NONE") + globals.a.nvim_command("highlight TypeBuiltin cterm=NONE gui=NONE") end, }) end, config = function() - vim.api.nvim_command("colorscheme enfocado") - + globals.g.enfocado_style = 'neon' + globals.a.nvim_command("colorscheme enfocado") end, } From fcfae2f7592b29cfbe441399fb4d1db98348d322 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Wed, 19 Jul 2023 21:12:35 -0500 Subject: [PATCH 24/51] update: lazy-lock package --- lazy-lock.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index fac8b11..6754a22 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" }, + "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -9,44 +9,44 @@ "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, - "friendly-snippets": { "branch": "main", "commit": "ca668b7a4a2913ad1109b5e4aaf0013651956b13" }, - "gitsigns.nvim": { "branch": "main", "commit": "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220" }, + "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, + "gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, - "lazy.nvim": { "branch": "main", "commit": "da8b00581a52f5f87ad2aba9f52171fda7491f18" }, + "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "796008869e67ef27a5aa5ac44c08ce2a60b89f55" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, "npairs-integrate-upair": { "branch": "main", "commit": "727ecc0c3e1ac9e5a5988b240325b274a75b9ac2" }, "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, - "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" }, + "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "3bde6f786057fa29d8356559b2ae3a52d9317fba" }, - "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, + "nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" }, + "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-jdtls": { "branch": "master", "commit": "96e3978c3fdae3950f6ccda548775e8b8952f74a" }, - "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" }, - "nvim-treesitter": { "branch": "master", "commit": "b4b94ec387525cb9df4b56eb1a8bf33231a0df47" }, + "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, + "nvim-treesitter": { "branch": "master", "commit": "4115fad9fded72571bdc3e0f7351e64b31799a3d" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "d2ea7b31b805cf4b7a05d032d0ec9d356345d3df" }, - "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, - "plenary.nvim": { "branch": "master", "commit": "bda256fab0eb66a15e8190937e417e6a14ee5d72" }, - "telescope.nvim": { "branch": "master", "commit": "276362a8020c6e94c7a76d49aa00d4923b0c02f3" }, + "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, + "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, + "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, - "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" }, + "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" }, "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, - "vim-enfocado": { "branch": "main", "commit": "d728a74a80c29476f6e5e2ce52dbe82bbbccd12e" }, - "vim-fugitive": { "branch": "master", "commit": "43f18ab9155c853a84ded560c6104e6300ad41da" }, + "vim-enfocado": { "branch": "main", "commit": "845835a58d285eb8c1ced5dba83bfdec6e40d828" }, + "vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }, "vim-move": { "branch": "master", "commit": "244a2908ffbca3d09529b3ec24c2c090f489f401" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" } From 23d0248d918e07b15b7be1d9f348238bae50f64c Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 1 Aug 2023 08:31:22 -0500 Subject: [PATCH 25/51] chore(themes): cambios en temas --- lua/themes/enfocado.lua | 2 +- lua/themes/everblush.lua | 2 +- lua/themes/nord.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/themes/enfocado.lua b/lua/themes/enfocado.lua index f87e3fe..78ad0a7 100644 --- a/lua/themes/enfocado.lua +++ b/lua/themes/enfocado.lua @@ -2,7 +2,7 @@ local globals = require('globals') return { "wuelnerdotexe/vim-enfocado", lazy = false, - enabled = true, + enabled = false, priority = 1000, init = function() globals.a.nvim_set_var("enfocado_plugins", { diff --git a/lua/themes/everblush.lua b/lua/themes/everblush.lua index 95bd4f2..d4098d3 100644 --- a/lua/themes/everblush.lua +++ b/lua/themes/everblush.lua @@ -2,7 +2,7 @@ return { 'Everblush/nvim', name = "everblush", lazy = false, - enabled = false, + enabled = true, priority = 1000, config = function() require('everblush').setup({ diff --git a/lua/themes/nord.lua b/lua/themes/nord.lua index c9c3597..a7b692d 100644 --- a/lua/themes/nord.lua +++ b/lua/themes/nord.lua @@ -4,7 +4,7 @@ return { enabled = false, priority = 1000, config = function() - vim.g.nord_italic = true + vim.g.nord_italic = false vim.g.nord_italic_comments = false vim.g.nord_bold = false vim.g.nord_underline = true From ee8bb47424553b98cbbe3368bc5a80e657318f9f Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 1 Aug 2023 08:32:00 -0500 Subject: [PATCH 26/51] fix: se agrego variables globales a config-lsp --- lua/plugins/config/lsp/config_lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/config/lsp/config_lsp.lua b/lua/plugins/config/lsp/config_lsp.lua index fe88b9e..e1cee3b 100644 --- a/lua/plugins/config/lsp/config_lsp.lua +++ b/lua/plugins/config/lsp/config_lsp.lua @@ -2,6 +2,7 @@ -- Set up completion using nvim_cmp with LSP source -- local globals = require('globals') +local vim = globals.vim local capabilities = require('cmp_nvim_lsp').default_capabilities( globals.lsp.protocol.make_client_capabilities() ) From b3e0b03e2ad59fea8dc9fabb6cf2e7948946676d Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 1 Aug 2023 08:32:45 -0500 Subject: [PATCH 27/51] chore: upgrade lazy-lock.json --- lazy-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6754a22..7304e34 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, + "LuaSnip": { "branch": "master", "commit": "e81cbe6004051c390721d8570a4a0541ceb0df10" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -9,43 +9,43 @@ "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, - "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, - "gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" }, + "everblush": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" }, + "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" }, + "gitsigns.nvim": { "branch": "main", "commit": "5d73da785a3c05fd63ac31769079db05169a6ec7" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, - "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, - "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, "npairs-integrate-upair": { "branch": "main", "commit": "727ecc0c3e1ac9e5a5988b240325b274a75b9ac2" }, - "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, + "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" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" }, + "nvim-dap": { "branch": "master", "commit": "2f28ea843bcdb378b171a66ddcd568516e431d55" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-jdtls": { "branch": "master", "commit": "96e3978c3fdae3950f6ccda548775e8b8952f74a" }, - "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, - "nvim-treesitter": { "branch": "master", "commit": "4115fad9fded72571bdc3e0f7351e64b31799a3d" }, + "nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" }, + "nvim-treesitter": { "branch": "master", "commit": "1c79da3300951e934f635eaf8703480b57644e7e" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, - "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, + "telescope.nvim": { "branch": "master", "commit": "b6fccfb0f7589a87587875206786daccba62acc3" }, "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, - "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, - "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, + "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, + "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" }, "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, - "vim-enfocado": { "branch": "main", "commit": "845835a58d285eb8c1ced5dba83bfdec6e40d828" }, "vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }, "vim-move": { "branch": "master", "commit": "244a2908ffbca3d09529b3ec24c2c090f489f401" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, From 69a1b801bb5d1084c90a83b6332e7ec97cabb470 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 1 Aug 2023 10:03:02 -0500 Subject: [PATCH 28/51] feat: empezando la configuracion de java --- lua/plugins/config/java.lua | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 lua/plugins/config/java.lua diff --git a/lua/plugins/config/java.lua b/lua/plugins/config/java.lua new file mode 100644 index 0000000..4551781 --- /dev/null +++ b/lua/plugins/config/java.lua @@ -0,0 +1,7 @@ +return { + "mfussenegger/nvim-jdtls", + dependencies = { "mfussenegger/nvim-dap", "neovim/nvim-lspconfig" }, + event = "VeryLazy", + config = function() + end +} From 08841cf1759696b341a51f18857f0175d18cc3a7 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 1 Aug 2023 10:03:32 -0500 Subject: [PATCH 29/51] fix: cambios en el fondo transparente del tema everblush --- lua/themes/everblush.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/themes/everblush.lua b/lua/themes/everblush.lua index d4098d3..d6503a4 100644 --- a/lua/themes/everblush.lua +++ b/lua/themes/everblush.lua @@ -8,7 +8,7 @@ return { require('everblush').setup({ -- Default options override = {}, - transparent_background = true, + transparent_background = false, nvim_tree = { contrast = false, }, From 43a2d01666edbcbf1aaceaa839948485706b9643 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 16:17:16 -0500 Subject: [PATCH 30/51] fix: cambios de version 3.0 en neo-tree cambios los keymaps de neo-tree por la version 3.0 que rompieron los comandos anteriores --- lua/core/keys.lua | 4 ++-- lua/plugins/config/neo-tree.lua | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lua/core/keys.lua b/lua/core/keys.lua index 683e8a9..17af88f 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -102,5 +102,5 @@ a.nvim_set_keymap('n', 'ds', ':DapTerminate', { noremap = true }) a.nvim_set_keymap('n', 'du', ':lua require("dapui").toggle()', { noremap = true }) -- Neotree -a.nvim_set_keymap('n', 'p', ':NeoTreeFocusToggle', { noremap = true }) -a.nvim_set_keymap('n', 'g', ':NeoTreeFocusToggle git_status', { noremap = true }) +a.nvim_set_keymap('n', 'p', ':Neotree toggle focus', { noremap = true }) +a.nvim_set_keymap('n', 'g', ':Neotree toggle focus git_status', { noremap = true }) diff --git a/lua/plugins/config/neo-tree.lua b/lua/plugins/config/neo-tree.lua index ffa4885..b50da54 100644 --- a/lua/plugins/config/neo-tree.lua +++ b/lua/plugins/config/neo-tree.lua @@ -1,6 +1,7 @@ return { "nvim-neo-tree/neo-tree.nvim", - dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", "MunifTanjim/nui.nvim" }, + branch = "v3.x", + dependencies = { "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim" }, --deactivate = function() vim.api.nvim_command("Neotree close") end, config = function() require("neo-tree").setup({ @@ -10,7 +11,7 @@ return { use_default_mappings = false, source_selector = { winbar = true, - source = { { source = "filesystem", display_name = " 󰉓 Folders "},{ source = "git_status", display_name = "  Git "} }, + --source = { { source = "filesystem", display_name = " 󰉓 Folders "},{ source = "git_status", display_name = "  Git "} }, content_layout = "center", separator = "", separator_active = { left = "▎", right = "" }, From 151574b5be84a27c874587f4a40869f14c4f5eea Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 16:58:21 -0500 Subject: [PATCH 31/51] fix: 'neo-tree' corregido message de error al cerrar el menu --- lua/plugins/config/neo-tree.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/plugins/config/neo-tree.lua b/lua/plugins/config/neo-tree.lua index b50da54..ce68bcd 100644 --- a/lua/plugins/config/neo-tree.lua +++ b/lua/plugins/config/neo-tree.lua @@ -2,7 +2,7 @@ return { "nvim-neo-tree/neo-tree.nvim", branch = "v3.x", dependencies = { "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim" }, - --deactivate = function() vim.api.nvim_command("Neotree close") end, + deactivate = function() require("neo-tree.command").execute({action = "close"}) end, config = function() require("neo-tree").setup({ enable_diagnostics = true, @@ -93,9 +93,9 @@ return { event_handlers = { { event = "file_opened", - handler = function(file_path) + handler = function() --auto close - require("neo-tree").close_all() + require("neo-tree.command").execute({action = "close"}) end }, }, From 78f12c23d914e6194a7f4897ea8c59f5e96231cc Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 16:59:37 -0500 Subject: [PATCH 32/51] fix: cambios en el nombre del dir 'misc' se cambio el nombre de la carpeta misc a desc que significa desactivado, y contiene los plugins que no estamos usando de momento --- lua/plugins/{misc => desc}/bufferline.lua | 0 lua/plugins/{misc => desc}/go.lua | 0 lua/plugins/desc/tab-nine.lua | 33 +++++++++++++++++++++++ 3 files changed, 33 insertions(+) rename lua/plugins/{misc => desc}/bufferline.lua (100%) rename lua/plugins/{misc => desc}/go.lua (100%) create mode 100644 lua/plugins/desc/tab-nine.lua diff --git a/lua/plugins/misc/bufferline.lua b/lua/plugins/desc/bufferline.lua similarity index 100% rename from lua/plugins/misc/bufferline.lua rename to lua/plugins/desc/bufferline.lua diff --git a/lua/plugins/misc/go.lua b/lua/plugins/desc/go.lua similarity index 100% rename from lua/plugins/misc/go.lua rename to lua/plugins/desc/go.lua diff --git a/lua/plugins/desc/tab-nine.lua b/lua/plugins/desc/tab-nine.lua new file mode 100644 index 0000000..541e823 --- /dev/null +++ b/lua/plugins/desc/tab-nine.lua @@ -0,0 +1,33 @@ +--Plugin de CMP para tabnine +return { + { + "tzachar/cmp-tabnine", + lazy = true, + dependencies = "hrsh7th/nvim-cmp", + build = "./install.sh", + config = function() + local tabnine = require('cmp_tabnine.config') + tabnine.setup({ + ignored_file_types = { + ["aerial"] = true, + ["checkhealth"] = true, + ["dap-repl"] = true, + ["dapui_breakpoints"] = true, + ["dapui_console"] = true, + ["dapui_hover"] = true, + ["dapui_scopes"] = true, + ["dapui_stacks"] = true, + ["dapui_watches"] = true, + ["lspinfo"] = true, + ["mason"] = true, + ["nerdterm"] = true, + ["noice"] = true, + ["notify"] = true, + ["null-ls-info"] = true, + ["qf"] = true, + ["TelescopePrompt"] = true, + }, + }) + end + }, +} From fadbc1169028dcb1436be27ab9180fed613cc783 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 20:15:39 -0500 Subject: [PATCH 33/51] fix: actualizando configuracion de lsp --- lua/plugins/config/lsp/capabilities_lsp.lua | 2 - lua/plugins/config/lsp/config_lsp.lua | 5 ++- lua/plugins/config/lsp/init.lua | 8 ++++ lua/plugins/config/lsp/servers_lsp.lua | 44 ++++++++------------- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/lua/plugins/config/lsp/capabilities_lsp.lua b/lua/plugins/config/lsp/capabilities_lsp.lua index 5232cc7..a582fa7 100644 --- a/lua/plugins/config/lsp/capabilities_lsp.lua +++ b/lua/plugins/config/lsp/capabilities_lsp.lua @@ -4,9 +4,7 @@ local M = {} globals.lsp.protocol.make_client_capabilities() ) M.on_attach = function(bufnr) - globals.a.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - -- Mappings. local bufopts = { noremap = true, silent = true, buffer = bufnr } globals.key.set('n', 'gD', globals.v.lsp.buf.declaration, bufopts) diff --git a/lua/plugins/config/lsp/config_lsp.lua b/lua/plugins/config/lsp/config_lsp.lua index e1cee3b..0701164 100644 --- a/lua/plugins/config/lsp/config_lsp.lua +++ b/lua/plugins/config/lsp/config_lsp.lua @@ -8,6 +8,9 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities( ) capabilities.textDocument.completion.completionItem.snippetSupport = true +--Config Servers +require('plugins.config.lsp.servers_lsp') + -- Mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions local opts = { noremap = true, silent = true } @@ -15,8 +18,6 @@ vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) ---Config Servers -require('plugins.config.lsp.servers_lsp') -- Diagnosticos de LSP vim.diagnostic.config({ diff --git a/lua/plugins/config/lsp/init.lua b/lua/plugins/config/lsp/init.lua index 7113952..f7a80cb 100644 --- a/lua/plugins/config/lsp/init.lua +++ b/lua/plugins/config/lsp/init.lua @@ -4,9 +4,17 @@ return { { "williamboman/mason-lspconfig.nvim", dependencies = "williamboman/mason.nvim", + cmd = { "LspInstall", "LspUninstall" }, + config = function () + require("mason-lspconfig").setup({ + ensure_installed = {"cssls","eslint","jsonls","tailwindcss","tsserver"} + }) + end, }, "hrsh7th/cmp-nvim-lsp", }, + cmd = {"LspInfo", "LspLog", "LspRestart", "LspStart", "LspStop"}, + event = { "BufReadPost", "FileType" }, config = function() require("plugins.config.lsp.config_lsp") end diff --git a/lua/plugins/config/lsp/servers_lsp.lua b/lua/plugins/config/lsp/servers_lsp.lua index 25949a3..ed803f3 100644 --- a/lua/plugins/config/lsp/servers_lsp.lua +++ b/lua/plugins/config/lsp/servers_lsp.lua @@ -1,11 +1,11 @@ local nvim_lsp = require('lspconfig') local capabilities, on_attach, lsp_flags = require('plugins.config.lsp.capabilities_lsp') -nvim_lsp['tsserver'].setup { - capabilities = capabilities, - on_attach = on_attach, - flags = lsp_flags, -} +--nvim_lsp['tsserver'].setup { +--capabilities = capabilities, +--on_attach = on_attach, +--flags = lsp_flags, +--} --Go Server --nvim_lsp.gopls.setup { @@ -23,7 +23,6 @@ nvim_lsp['jdtls'].setup { cmd = { 'jdtls' } } - --Astro server nvim_lsp['astro'].setup { capabilities = capabilities, @@ -78,7 +77,7 @@ nvim_lsp['vimls'].setup {} nvim_lsp['lua_ls'].setup { on_attach = on_attach, flags = lsp_flags, - format = {enable = true} + format = { enable = true } } --ESLINT Server Config @@ -89,29 +88,20 @@ nvim_lsp.eslint.setup({ }) --- StyleLint Config -nvim_lsp['stylelint_lsp'].setup { - filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'less', 'astro' }, - capabilities = capabilities, - on_attach = on_attach, - settings = { - autoFixOnSave = true, - autoFixOnFormat = true, - validateOnType = true - -- other settings... - } -} +--nvim_lsp['stylelint_lsp'].setup { +--filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'less', 'astro' }, +--capabilities = capabilities, +--on_attach = on_attach, +--settings = { +--autoFixOnSave = true, +--autoFixOnFormat = true, +--validateOnType = true +---- other settings... +--} +--} --JSON Lenguaje nvim_lsp['jsonls'].setup { on_attach = on_attach, flags = lsp_flags, } - --- Tailwind --- require("lspconfig").tailwindcss.setup({ --- on_attach = on_attach, --- flags = lsp_flags, --- capabilities = capabilities, ---}) - - From af51e2d73482886d14ae3555b500ba9700738c6e Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 20:16:09 -0500 Subject: [PATCH 34/51] fix: mejorando la config de mason --- lua/plugins/config/mason.lua | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/lua/plugins/config/mason.lua b/lua/plugins/config/mason.lua index 352024c..e56b17e 100644 --- a/lua/plugins/config/mason.lua +++ b/lua/plugins/config/mason.lua @@ -1,17 +1,14 @@ return { - "williamboman/mason.nvim", - lazy = true, - config = function() - require("mason").setup() - require("mason-lspconfig").setup({ - automatic_installation = true, - ensure_installed = { - "cssls", - "eslint", - "html", - "jsonls", - "tsserver", - }, - }) - end, + { + "williamboman/mason.nvim", + build = ":MasonUpdate", + cmd = { "Mason", "MasonInstall", "MasonLog", "MasonUninstall", "MasonUninstallAll", "MasonUpdate" }, + lazy = true, + config = function() require("mason").setup({ ui = { border = "rounded" } }) end, + }, + { + "mrjones2014/smart-splits.nvim", + optional = true, + opts = function(_, opts) opts.ignored_filetypes = vim.list_extend(opts.ignored_filetypes or {}, { "mason" }) end, + }, } From 756c463edc3e25c331db4332936fad5462418503 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 20:16:53 -0500 Subject: [PATCH 35/51] fix: arreglando los errores cmp --- lua/plugins/config/cmp.lua | 101 ++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 25 deletions(-) diff --git a/lua/plugins/config/cmp.lua b/lua/plugins/config/cmp.lua index 3cf8d7b..ca218ae 100644 --- a/lua/plugins/config/cmp.lua +++ b/lua/plugins/config/cmp.lua @@ -1,4 +1,6 @@ local globals = require('globals') +local vim = globals.vim + return { { "hrsh7th/nvim-cmp", @@ -7,7 +9,6 @@ return { "nvim-treesitter/nvim-treesitter", "onsails/lspkind.nvim" }, - config = function() globals.opt.completeopt = "menu,menuone,noselect" @@ -21,25 +22,24 @@ 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 = 300, throttle = 40 }, + performance = { debounce = 42, throttle = 42, fetching_time = 300 }, mapping = { [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.select_next_item(), [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.confirm({ select = true}), + [''] = cmp.mapping.confirm({ select = true }), --- Tab tigger seleccion [''] = cmp.mapping(function(fallback) if luasnip.expand_or_jumpable() then luasnip.expand_or_jump() elseif cmp.visible() then - cmp.confirm({select = true}) + cmp.confirm({ select = true }) elseif has_words_before() then cmp.complete() else @@ -73,7 +73,7 @@ return { }), }, sources = { - { name = 'path', }, + { name = 'path' }, { name = 'nvim_lsp', keyword_length = 1 }, { name = 'buffer', @@ -93,12 +93,12 @@ return { }, { name = 'luasnip', keyword_length = 1, priority = 1 }, { name = 'cmp_tabnine', keyword_length = 1, priority = 2 }, - { name = 'emmet', keyword_length = 1, priority = 5 }, + { name = 'emmet', keyword_length = 1, priority = 5 }, }, window = { documentation = cmp.config.window.bordered(), }, - experimental = { ghost_text = false}, + experimental = { ghost_text = false }, }) -- Set configuration for specific filetype. @@ -122,19 +122,50 @@ return { globals.cmd [[highlight! default link CmpItemKind CmpItemMenuDefault]] end, }, - { "hrsh7th/cmp-buffer", event = "InsertEnter", dependencies = "hrsh7th/nvim-cmp" }, - { "hrsh7th/cmp-path", event = "InsertEnter", dependencies = "hrsh7th/nvim-cmp" }, + { + "hrsh7th/cmp-buffer", + event = "InsertEnter", + dependencies = "hrsh7th/nvim-cmp" + }, + { + "jackieaskins/cmp-emmet", + build = "npm run release", + dependencies = { "hrsh7th/nvim-cmp", dependencies = "L3MON4D3/LuaSnip" }, + lazy = true, + init = function() + vim.api.nvim_create_autocmd("FileType", { + pattern = "css,sass,scss,less,xml,html,javascriptreact,typescriptreact", + callback = function(ev) + vim.api.nvim_buf_set_keymap(ev.buf, "i", "", "", { + callback = function() + if not package.loaded["cmp-emmet"] then require("lazy").load({ plugins = { "cmp-emmet" } }) end + require("cmp").complete({ config = { sources = { { name = "emmet" } } } }) + end, + }) + end, + }) + end, + }, + { + "hrsh7th/cmp-path", + event = "InsertEnter", + dependencies = "hrsh7th/nvim-cmp" + }, { "hrsh7th/cmp-cmdline", event = "CmdlineEnter", - dependencies = { "hrsh7th/nvim-cmp", "hrsh7th/cmp-buffer", "hrsh7th/cmp-path" }, + dependencies = "hrsh7th/nvim-cmp", config = function() require("cmp").setup.cmdline({ "/", "?" }, { mapping = require("cmp").mapping.preset.cmdline(), - sources = require("cmp").config.sources({ - { name = "buffer", option = { indexing_interval = 284 }, keyword_length = 1, priority = 1 }, - }), + sources = { + { + name = "buffer", + option = { indexing_interval = 171 }, + keyword_length = 1 + }, + }, }) require("cmp").setup.cmdline(":", { @@ -149,28 +180,48 @@ return { }, { "hrsh7th/cmp-nvim-lsp", - event = "LspAttach", - dependencies = { "hrsh7th/nvim-cmp", "L3MON4D3/LuaSnip" } + dependencies = { "hrsh7th/nvim-cmp", dependencies = "L3MON4D3/LuaSnip" }, + lazy = true, + init = function() + vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("load_cmp_nvim_lsp", { clear = false }), + callback = function(ev) + if package.loaded["cmp_nvim_lsp"] then + vim.api.nvim_clear_autocmds({ group = ev.group }) + return true + end + + vim.api.nvim_create_autocmd("InsertEnter", { + buffer = ev.buf, + group = ev.group, + callback = function() + vim.api.nvim_clear_autocmds({ group = ev.group }) + require("lazy").load({ plugins = { "cmp-nvim-lsp" } }) + end, + }) + end, + }) + end, }, { "saadparwaiz1/cmp_luasnip", event = "InsertEnter", - dependencies = { "hrsh7th/nvim-cmp", "L3MON4D3/LuaSnip" } - }, - { - "jackieaskins/cmp-emmet", - build = "npm run release", - event = "InsertEnter", - dependencies = "hrsh7th/nvim-cmp" + dependencies = { + { + "hrsh7th/nvim-cmp", + dependencies = "L3MON4D3/LuaSnip" + }, + "L3MON4D3/LuaSnip" + } }, { "rcarriga/cmp-dap", - ft = { "dap-repl", "dapui_watches", "dapui_hover" }, dependencies = "hrsh7th/nvim-cmp", + event = [[InsertEnter *dap-repl*,DAP\ Watches,DAP\ Hover]], config = function() require("cmp").setup.filetype( { "dap-repl", "dapui_watches", "dapui_hover" }, - { sources = require("cmp").config.sources({ { name = "dap", keyword_lenght = 1 } }) } + { sources = { name = "dap" } } ) end, }, From aebdb928f5c666aa5d88b76e54a875e714fc24c8 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 20:17:16 -0500 Subject: [PATCH 36/51] chore(*): update package 'lazy-lock' --- lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7304e34..7df6b7d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "e81cbe6004051c390721d8570a4a0541ceb0df10" }, + "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -11,36 +11,36 @@ "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, "everblush": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" }, "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" }, - "gitsigns.nvim": { "branch": "main", "commit": "5d73da785a3c05fd63ac31769079db05169a6ec7" }, + "gitsigns.nvim": { "branch": "main", "commit": "31178496552584e84fa9e74e087dec1f6c347f5d" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "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": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "7951701fd21291ac473ea92d3fd57ec5c8bf10bb" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, - "npairs-integrate-upair": { "branch": "main", "commit": "727ecc0c3e1ac9e5a5988b240325b274a75b9ac2" }, + "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" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "2f28ea843bcdb378b171a66ddcd568516e431d55" }, + "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, - "nvim-jdtls": { "branch": "master", "commit": "96e3978c3fdae3950f6ccda548775e8b8952f74a" }, - "nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" }, - "nvim-treesitter": { "branch": "master", "commit": "1c79da3300951e934f635eaf8703480b57644e7e" }, + "nvim-jdtls": { "branch": "master", "commit": "095dc490f362adc85be66dc14bd9665ddd94413b" }, + "nvim-lspconfig": { "branch": "master", "commit": "c0de180ddb3df36feef8ac3607670894d0e7497f" }, + "nvim-treesitter": { "branch": "master", "commit": "8d5e5dc40a4c480483690777cefb8cf67e710702" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, - "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, + "nvim-web-devicons": { "branch": "master", "commit": "eb8f80f30fd5e9a6176dee5c46661ebd7437ac46" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, - "telescope.nvim": { "branch": "master", "commit": "b6fccfb0f7589a87587875206786daccba62acc3" }, + "telescope.nvim": { "branch": "master", "commit": "5a3fb8a012f9fcf777ba8deeae1c759362413efa" }, "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, From b9ca0ac0aad43be16284ccfe517bbf0823f562a8 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 21:17:04 -0500 Subject: [PATCH 37/51] =?UTF-8?q?fix:=20corregido=20el=20error=20de=20los?= =?UTF-8?q?=20lenguajes=20lsp=20se=20corrigi=C3=B3=20el=20error=20que=20ha?= =?UTF-8?q?bia=20con=20los=20lenguajes=20lsp=20{cambio=20importante}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/plugins/config/lsp/capabilities_lsp.lua | 20 --- lua/plugins/config/lsp/config_lsp.lua | 165 +++++++++++++++++--- lua/plugins/config/lsp/servers_lsp.lua | 107 ------------- 3 files changed, 145 insertions(+), 147 deletions(-) delete mode 100644 lua/plugins/config/lsp/capabilities_lsp.lua delete mode 100644 lua/plugins/config/lsp/servers_lsp.lua diff --git a/lua/plugins/config/lsp/capabilities_lsp.lua b/lua/plugins/config/lsp/capabilities_lsp.lua deleted file mode 100644 index a582fa7..0000000 --- a/lua/plugins/config/lsp/capabilities_lsp.lua +++ /dev/null @@ -1,20 +0,0 @@ -local M = {} - local globals = require('globals') - M.capabilities = require('cmp_nvim_lsp').default_capabilities( - globals.lsp.protocol.make_client_capabilities() - ) - M.on_attach = function(bufnr) - globals.a.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - -- Mappings. - local bufopts = { noremap = true, silent = true, buffer = bufnr } - globals.key.set('n', 'gD', globals.v.lsp.buf.declaration, bufopts) - globals.key.set('n', 'gd', globals.lsp.buf.definition, bufopts) - globals.keymap.set('n', 'K', globals.lsp.buf.hover, bufopts) - globals.keymap.set('n', 'el', globals.v.diagnostic.setloclist, bufopts) - globals.keymap.set('n', 'er', globals.v.diagnostic.open_float, bufopts) - end - - M.lsp_flags = { - debounce_text_changes = 150, - } -return M diff --git a/lua/plugins/config/lsp/config_lsp.lua b/lua/plugins/config/lsp/config_lsp.lua index 0701164..85050dc 100644 --- a/lua/plugins/config/lsp/config_lsp.lua +++ b/lua/plugins/config/lsp/config_lsp.lua @@ -1,16 +1,16 @@ ---LSP Instaler --- Set up completion using nvim_cmp with LSP source --- +--Variables globales local globals = require('globals') local vim = globals.vim + +--LSP Instaler +local nvim_lsp = require('lspconfig') + +-- Set up completion using nvim_cmp with LSP source local capabilities = require('cmp_nvim_lsp').default_capabilities( - globals.lsp.protocol.make_client_capabilities() + vim.lsp.protocol.make_client_capabilities() ) capabilities.textDocument.completion.completionItem.snippetSupport = true ---Config Servers -require('plugins.config.lsp.servers_lsp') - -- Mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions local opts = { noremap = true, silent = true } @@ -18,8 +18,135 @@ vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) +-- Use an on_attach function to only map the following keys +-- after the language server attaches to the current buffer +local on_attach = function(client, bufnr) + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'el', vim.diagnostic.setloclist, bufopts) + vim.keymap.set('n', 'er', vim.diagnostic.open_float, bufopts) +end + +local lsp_flags = { + debounce_text_changes = 150, +} + +--Config Servers +--Typescript, Javascript, JSX, TSX --- Diagnosticos de LSP +nvim_lsp.tsserver.setup { + capabilities = capabilities, + on_attach = on_attach, + flags = lsp_flags, +} + +--Go Server +nvim_lsp.gopls.setup { + on_attach = on_attach, + capabilities = capabilities, + flags = lsp_flags, + dap_debug = true, + dap_debug_gui = true +} + +--Astro server +nvim_lsp.astro.setup { + capabilities = capabilities, + on_attach = on_attach, + flags = lsp_flags, +} + +---CSS Modules +nvim_lsp.cssmodules_ls.setup { + on_attach = on_attach, + flags = lsp_flags, + filetypes = { + "javascript", "javascriptreact", "typescript", "typescriptreact" + } +} + +nvim_lsp.cssls.setup { + on_attach = on_attach, + flags = lsp_flags, + filetypes = { + "css", "scss", "less" + }, + settings = { + css = { + validate = true + }, + less = { + validate = true + }, + scss = { + validate = true + } + }, + single_file_support = true, +} + +-- Html Server +nvim_lsp.html.setup { + on_attach = on_attach, + flags = lsp_flags, + embeddedLanguages = { + css = true, + javascript = true + }, + providerFormatter = true, + single_file_support = true, +} + +--Vim Server +nvim_lsp.vimls.setup {} + +nvim_lsp.lua_ls.setup { + on_attach = on_attach, + flags = lsp_flags, + format = {enable = true} +} + +--ESLINT Server Config +nvim_lsp.eslint.setup({ + on_attach = on_attach, + flags = lsp_flags, + settings = { format = false }, +}) + +--- StyleLint Config +nvim_lsp.stylelint_lsp.setup { + filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'less', 'astro' }, + capabilities = capabilities, + handlers = handlers, + on_attach = on_attach, + settings = { + autoFixOnSave = true, + autoFixOnFormat = true, + validateOnType = true + -- other settings... + } +} + +--JSON Lenguaje +nvim_lsp.jsonls.setup { + on_attach = on_attach, + flags = lsp_flags, +} + +-- Tailwind + nvim_lsp.tailwindcss.setup({ + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +}) + +--Diagnostics vim.diagnostic.config({ --underline = true, virtual_text = false, @@ -30,18 +157,16 @@ vim.diagnostic.config({ source = 'always', } }) +--local signs = { + --Hint = "", + --Info = "", + --Warn = "", + --Error = "", +--} -local signs = { - Hint = "", - Info = "", - Warn = "", - Error = "", -} - -for type, icon in pairs(signs) do - local hl = "DiagnosticSign" .. type - vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) -end - +--for type, icon in pairs() do + --local hl = "DiagnosticSign" .. type + --vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) +--end -- Show line diagnostics automatically in hover window vim.o.updatetime = 250 diff --git a/lua/plugins/config/lsp/servers_lsp.lua b/lua/plugins/config/lsp/servers_lsp.lua deleted file mode 100644 index ed803f3..0000000 --- a/lua/plugins/config/lsp/servers_lsp.lua +++ /dev/null @@ -1,107 +0,0 @@ -local nvim_lsp = require('lspconfig') -local capabilities, on_attach, lsp_flags = require('plugins.config.lsp.capabilities_lsp') - ---nvim_lsp['tsserver'].setup { ---capabilities = capabilities, ---on_attach = on_attach, ---flags = lsp_flags, ---} - ---Go Server ---nvim_lsp.gopls.setup { --- on_attach = on_attach, --- capabilities = capabilities, --- flags = lsp_flags, --- dap_debug = true, --- dap_debug_gui = true ---} - ---Java Server -nvim_lsp['jdtls'].setup { - capabilities = capabilities, - on_attach = on_attach, - cmd = { 'jdtls' } -} - ---Astro server -nvim_lsp['astro'].setup { - capabilities = capabilities, - on_attach = on_attach, - flags = lsp_flags, -} - ----CSS Modules -nvim_lsp['cssmodules_ls'].setup { - on_attach = on_attach, - flags = lsp_flags, - filetypes = { - "javascript", "javascriptreact", "typescript", "typescriptreact" - } -} - -nvim_lsp['cssls'].setup { - on_attach = on_attach, - flags = lsp_flags, - filetypes = { - "css", "scss", "less" - }, - settings = { - css = { - validate = true - }, - less = { - validate = true - }, - scss = { - validate = true - } - }, - single_file_support = true, -} - --- Html Server -nvim_lsp['html'].setup { - on_attach = on_attach, - flags = lsp_flags, - embeddedLanguages = { - css = true, - javascript = true - }, - providerFormatter = true, - single_file_support = true, -} - ---Vim Server -nvim_lsp['vimls'].setup {} - -nvim_lsp['lua_ls'].setup { - on_attach = on_attach, - flags = lsp_flags, - format = { enable = true } -} - ---ESLINT Server Config -nvim_lsp.eslint.setup({ - on_attach = on_attach, - flags = lsp_flags, - settings = { format = false }, -}) - ---- StyleLint Config ---nvim_lsp['stylelint_lsp'].setup { ---filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'less', 'astro' }, ---capabilities = capabilities, ---on_attach = on_attach, ---settings = { ---autoFixOnSave = true, ---autoFixOnFormat = true, ---validateOnType = true ----- other settings... ---} ---} - ---JSON Lenguaje -nvim_lsp['jsonls'].setup { - on_attach = on_attach, - flags = lsp_flags, -} From 8f9cab3dab9563b8620c0d6b2184320bc237aa5d Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 6 Aug 2023 21:19:50 -0500 Subject: [PATCH 38/51] chore(): nueva variable global --- lua/globals.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/globals.lua b/lua/globals.lua index a3de738..9188878 100644 --- a/lua/globals.lua +++ b/lua/globals.lua @@ -7,6 +7,7 @@ local a = vim.api local key = vim.keymap local lsp = vim.lsp local vim = vim +local diagnostics = vim.diagnostics return { opt = opt, @@ -15,5 +16,6 @@ return { a = a, key = key, lsp = lsp, - vim = vim + vim = vim, + diagnostics = diagnostics } From 0361308950953ec968893a36a17042f8c0ede44d Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 8 Aug 2023 16:59:47 -0500 Subject: [PATCH 39/51] feat: lsp config java lsp ref: #42 --- lua/plugins/config/java.lua | 6 +++--- lua/plugins/config/lsp/config_lsp.lua | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lua/plugins/config/java.lua b/lua/plugins/config/java.lua index 4551781..c531604 100644 --- a/lua/plugins/config/java.lua +++ b/lua/plugins/config/java.lua @@ -1,7 +1,7 @@ return { - "mfussenegger/nvim-jdtls", + "mfussenegger/nvim-jdtls", dependencies = { "mfussenegger/nvim-dap", "neovim/nvim-lspconfig" }, - event = "VeryLazy", + --event = "VeryLazy", config = function() - end + end } diff --git a/lua/plugins/config/lsp/config_lsp.lua b/lua/plugins/config/lsp/config_lsp.lua index 85050dc..8ff29d9 100644 --- a/lua/plugins/config/lsp/config_lsp.lua +++ b/lua/plugins/config/lsp/config_lsp.lua @@ -39,7 +39,6 @@ local lsp_flags = { --Config Servers --Typescript, Javascript, JSX, TSX - nvim_lsp.tsserver.setup { capabilities = capabilities, on_attach = on_attach, @@ -54,6 +53,12 @@ nvim_lsp.gopls.setup { dap_debug = true, dap_debug_gui = true } +--Java Server +nvim_lsp.jdtls.setup { + capabilities = capabilities, + on_attach = on_attach, + cmd = { "jdtls", "-configuration", "/home/user/.cache/jdtls/config", "-data", "/home/user/.cache/jdtls/workspace" } +} --Astro server nvim_lsp.astro.setup { From a9685f7047db90649681d16dc0e0adcf8d14b448 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 8 Aug 2023 17:01:53 -0500 Subject: [PATCH 40/51] feat(treesitter): instala automaticamente el server --- lua/plugins/config/treesitter.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plugins/config/treesitter.lua b/lua/plugins/config/treesitter.lua index 191248a..92b755a 100644 --- a/lua/plugins/config/treesitter.lua +++ b/lua/plugins/config/treesitter.lua @@ -7,9 +7,9 @@ return { config = function() require 'nvim-treesitter.configs'.setup { -- A list of parser names, or "all" - ensure_installed = { "lua", "astro", "html", }, + ensure_installed = { "lua", "astro", "html","java" }, sync_install = true, - + auto_install = true, ignore_install = { "" }, highlight = { From b025928acc8b46c43b8187b7309ab2c6ec93a5a6 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 8 Aug 2023 17:03:44 -0500 Subject: [PATCH 41/51] chore(themes): cambios en algunos temas de color --- lua/themes/everblush.lua | 2 +- lua/themes/gruvboxMaterial.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/themes/everblush.lua b/lua/themes/everblush.lua index d6503a4..fd976d4 100644 --- a/lua/themes/everblush.lua +++ b/lua/themes/everblush.lua @@ -2,7 +2,7 @@ return { 'Everblush/nvim', name = "everblush", lazy = false, - enabled = true, + enabled = false, priority = 1000, config = function() require('everblush').setup({ diff --git a/lua/themes/gruvboxMaterial.lua b/lua/themes/gruvboxMaterial.lua index a62ba32..b0b3fa5 100644 --- a/lua/themes/gruvboxMaterial.lua +++ b/lua/themes/gruvboxMaterial.lua @@ -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_background = 'hard' vim.g.gruvbox_material_enable_bold = false 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 From 7f4f6260a381f6008cd5e19d6296733f9b1bcc29 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 8 Aug 2023 17:04:12 -0500 Subject: [PATCH 42/51] =?UTF-8?q?chore(*)=20upgrade=20package=20=C2=B4lazy?= =?UTF-8?q?-lock=C2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7df6b7d..b4b8bc2 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,9 +9,9 @@ "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, - "everblush": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" }, "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" }, "gitsigns.nvim": { "branch": "main", "commit": "31178496552584e84fa9e74e087dec1f6c347f5d" }, + "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, From 0bbfaa8fd933f4dabb2e1ff08d4e47958f9b9487 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Thu, 10 Aug 2023 15:27:40 -0500 Subject: [PATCH 43/51] chore(*): update package lazy-lock --- lazy-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/lazy-lock.json b/lazy-lock.json index b4b8bc2..b92c47b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,6 +25,7 @@ "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" }, "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" }, From 18dbbaee5d21e4c75e2fa0f07a0d8f9defceeedc Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Thu, 24 Aug 2023 12:04:33 -0500 Subject: [PATCH 44/51] =?UTF-8?q?fix:=20se=20actualiz=C3=B3=20a=20la=20con?= =?UTF-8?q?fig=20de=20wsl-arch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ftplugin/java.lua | 8 ++++++++ lua/plugins/config/java.lua | 5 +---- lua/plugins/config/lsp/config_lsp.lua | 3 +-- lua/themes/gruvboxMaterial.lua | 8 ++++---- lua/themes/nightfox.lua | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 ftplugin/java.lua diff --git a/ftplugin/java.lua b/ftplugin/java.lua new file mode 100644 index 0000000..e36221c --- /dev/null +++ b/ftplugin/java.lua @@ -0,0 +1,8 @@ +local globals = require('globals') +local vim = globals.vim + +local config = { + cmd = {require("mason-registry").get_package("jdtls"):get_install_path() .. "/bin/jdtls"}, + root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]), +} +require('jdtls').start_or_attach(config) diff --git a/lua/plugins/config/java.lua b/lua/plugins/config/java.lua index c531604..5787adf 100644 --- a/lua/plugins/config/java.lua +++ b/lua/plugins/config/java.lua @@ -1,7 +1,4 @@ return { "mfussenegger/nvim-jdtls", - dependencies = { "mfussenegger/nvim-dap", "neovim/nvim-lspconfig" }, - --event = "VeryLazy", - config = function() - end + lazy = true } diff --git a/lua/plugins/config/lsp/config_lsp.lua b/lua/plugins/config/lsp/config_lsp.lua index 8ff29d9..741161b 100644 --- a/lua/plugins/config/lsp/config_lsp.lua +++ b/lua/plugins/config/lsp/config_lsp.lua @@ -56,8 +56,7 @@ nvim_lsp.gopls.setup { --Java Server nvim_lsp.jdtls.setup { capabilities = capabilities, - on_attach = on_attach, - cmd = { "jdtls", "-configuration", "/home/user/.cache/jdtls/config", "-data", "/home/user/.cache/jdtls/workspace" } + on_attach = on_attach } --Astro server diff --git a/lua/themes/gruvboxMaterial.lua b/lua/themes/gruvboxMaterial.lua index b0b3fa5..3a77302 100644 --- a/lua/themes/gruvboxMaterial.lua +++ b/lua/themes/gruvboxMaterial.lua @@ -1,13 +1,13 @@ return { "sainnhe/gruvbox-material", lazy = false, - enabled = true, + enabled = false, priority = 1000, config = function() - --vim.g.gruvbox_material_background = 'hard' - vim.g.gruvbox_material_enable_bold = false + 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 = false + vim.g.gruvbox_material_transparent_background = true vim.cmd('colorscheme gruvbox-material') end diff --git a/lua/themes/nightfox.lua b/lua/themes/nightfox.lua index d2b80f4..d44051c 100644 --- a/lua/themes/nightfox.lua +++ b/lua/themes/nightfox.lua @@ -1,7 +1,7 @@ return { "EdenEast/nightfox.nvim", lazy = false, - enabled = false, + enabled = true, priority = 1000, config = function() require('nightfox').setup({ From df1fa475a1c188eb679833de706fb91de17abf8f Mon Sep 17 00:00:00 2001 From: Fabian-Molina Date: Sun, 10 Sep 2023 20:22:52 -0500 Subject: [PATCH 45/51] chore(*): update package --- lazy-lock.json | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index b92c47b..617e302 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" }, + "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -9,39 +9,38 @@ "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" }, - "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, + "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" }, + "gitsigns.nvim": { "branch": "main", "commit": "79127db3b127f5d125f35e0d44ba60715edf2842" }, + "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "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": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, "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" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, + "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "e62babc62c7f8de579ad69d0a5d2613bff864126" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, - "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" }, + "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" }, + "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, - "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, + "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" }, + "nvim-dap": { "branch": "master", "commit": "4377a05b9476587b7b485d6a9d9745768c4e4b37" }, "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-lspconfig": { "branch": "master", "commit": "f7922e59aeb9bc3e31a660ea4e7405ffa3fc2c3a" }, + "nvim-treesitter": { "branch": "master", "commit": "4d41d9bfb09dd0836ce6910404e3cd570500c9ca" }, "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" }, + "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, + "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, + "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, From 0bfdeafa3907b95161cdd3260269112946cd035b Mon Sep 17 00:00:00 2001 From: Fabian-Molina Date: Mon, 11 Sep 2023 22:49:43 -0500 Subject: [PATCH 46/51] chore(*): algunos cambios de temas --- lazy-lock.json | 46 +++++++++++++++++----------------- lua/themes/gruvboxMaterial.lua | 4 +-- lua/themes/nightfox.lua | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 617e302..2ba0525 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, + "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -9,44 +9,44 @@ "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, - "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" }, - "gitsigns.nvim": { "branch": "main", "commit": "79127db3b127f5d125f35e0d44ba60715edf2842" }, + "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, + "gitsigns.nvim": { "branch": "main", "commit": "fef5d90953f0a730483b44745fae5938ba8227f8" }, + "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, - "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, + "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, "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": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "20fd7f50f34b59031a7c3bbc2c207f4f60037628" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, - "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "e62babc62c7f8de579ad69d0a5d2613bff864126" }, - "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, + "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "2d89ca96e08eb6e9c8e50e1bb4738bc5125c9f12" }, + "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" }, + "npairs-integrate-upair": { "branch": "main", "commit": "b3f3b61dc5cc8aadc71cc4b038b34e9e248254dc" }, + "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, - "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, + "nvim-autopairs": { "branch": "master", "commit": "defad64afbf19381fe31488a7582bbac421d6e38" }, + "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "4377a05b9476587b7b485d6a9d9745768c4e4b37" }, - "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, + "nvim-dap": { "branch": "master", "commit": "0e6b7c47dd70e80793ed39271b2aa712d9366dbc" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-jdtls": { "branch": "master", "commit": "095dc490f362adc85be66dc14bd9665ddd94413b" }, - "nvim-lspconfig": { "branch": "master", "commit": "f7922e59aeb9bc3e31a660ea4e7405ffa3fc2c3a" }, - "nvim-treesitter": { "branch": "master", "commit": "4d41d9bfb09dd0836ce6910404e3cd570500c9ca" }, + "nvim-lspconfig": { "branch": "master", "commit": "d177ad277a638f262edb73c75ffe33e377b95dc5" }, + "nvim-treesitter": { "branch": "master", "commit": "96a50241987531fdb8a516998b72c19f563ccd6c" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, - "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, - "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, - "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, - "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, + "nvim-web-devicons": { "branch": "master", "commit": "ecdeb4e2a4af34fc873bbfbf1f4c4e447e632255" }, + "plenary.nvim": { "branch": "master", "commit": "0232372b906f275f76ac42029eba25eaf95e76b9" }, + "telescope.nvim": { "branch": "master", "commit": "a19770625aed49ad2a9f591a5e3946707f7359f6" }, + "tmux.nvim": { "branch": "main", "commit": "673782b74a6055d430d3f5148a033edd99e5519f" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, - "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, + "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" }, "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, - "vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }, + "vim-fugitive": { "branch": "master", "commit": "6fcb0ad03982de646e3fecb6915e585651b9a9fb" }, "vim-move": { "branch": "master", "commit": "244a2908ffbca3d09529b3ec24c2c090f489f401" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" } diff --git a/lua/themes/gruvboxMaterial.lua b/lua/themes/gruvboxMaterial.lua index 3a77302..82e4534 100644 --- a/lua/themes/gruvboxMaterial.lua +++ b/lua/themes/gruvboxMaterial.lua @@ -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 diff --git a/lua/themes/nightfox.lua b/lua/themes/nightfox.lua index d44051c..d2b80f4 100644 --- a/lua/themes/nightfox.lua +++ b/lua/themes/nightfox.lua @@ -1,7 +1,7 @@ return { "EdenEast/nightfox.nvim", lazy = false, - enabled = true, + enabled = false, priority = 1000, config = function() require('nightfox').setup({ From 8be9682ebeadc38f80936a6f989839539f471eaa Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Tue, 19 Sep 2023 16:26:04 -0500 Subject: [PATCH 47/51] chore(*): update package lazy-lock --- lazy-lock.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index 2ba0525..971c111 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,7 +11,16 @@ "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, "gitsigns.nvim": { "branch": "main", "commit": "fef5d90953f0a730483b44745fae5938ba8227f8" }, +<<<<<<< Updated upstream +<<<<<<< Updated upstream +<<<<<<< Updated upstream "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" }, +======= +>>>>>>> Stashed changes +======= +>>>>>>> Stashed changes +======= +>>>>>>> Stashed changes "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, @@ -25,6 +34,18 @@ "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, +<<<<<<< Updated upstream +<<<<<<< Updated upstream +<<<<<<< Updated upstream +======= + "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, +>>>>>>> Stashed changes +======= + "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, +>>>>>>> Stashed changes +======= + "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, +>>>>>>> Stashed changes "npairs-integrate-upair": { "branch": "main", "commit": "b3f3b61dc5cc8aadc71cc4b038b34e9e248254dc" }, "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, From d503aa1e5bf4eb84afe618e22a1da60ef2ea287c Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Thu, 28 Sep 2023 17:36:59 -0500 Subject: [PATCH 48/51] feat(docs): documentacion de lista de errores --- docs/list-errors.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/list-errors.md diff --git a/docs/list-errors.md b/docs/list-errors.md new file mode 100644 index 0000000..f7fc835 --- /dev/null +++ b/docs/list-errors.md @@ -0,0 +1 @@ +[] error plugins autopairs not install From 5ec1495265053a5dab307be32db97e8d4b220e37 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 1 Oct 2023 15:11:51 -0500 Subject: [PATCH 49/51] fix: errores de autopairs corregidos - Se actualizo el plugin de autopairs --- docs/list-errors.md | 2 +- lua/plugins/config/autopairs.lua | 145 ++++++++++++++----------------- lua/plugins/config/cmp.lua | 6 -- 3 files changed, 67 insertions(+), 86 deletions(-) diff --git a/docs/list-errors.md b/docs/list-errors.md index f7fc835..826d812 100644 --- a/docs/list-errors.md +++ b/docs/list-errors.md @@ -1 +1 @@ -[] error plugins autopairs not install +[x] error plugins autopairs not install diff --git a/lua/plugins/config/autopairs.lua b/lua/plugins/config/autopairs.lua index 2c09f4e..e4e29e7 100644 --- a/lua/plugins/config/autopairs.lua +++ b/lua/plugins/config/autopairs.lua @@ -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 }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, - { "", mode = "i" }, + { + { + "windwp/nvim-autopairs", + keys = { + { "", mode = "i" }, + { "", 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 = { + { "", mode = mode }, + { "", mode = mode }, + { "", 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, } diff --git a/lua/plugins/config/cmp.lua b/lua/plugins/config/cmp.lua index ca218ae..102d904 100644 --- a/lua/plugins/config/cmp.lua +++ b/lua/plugins/config/cmp.lua @@ -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 }, @@ -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 From f3f136358b8e046d01307671c295e39bc52542b8 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 1 Oct 2023 15:21:53 -0500 Subject: [PATCH 50/51] feat: actualizacion del plugin neo-tree --- lua/plugins/config/neo-tree.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/plugins/config/neo-tree.lua b/lua/plugins/config/neo-tree.lua index ce68bcd..e7ee58b 100644 --- a/lua/plugins/config/neo-tree.lua +++ b/lua/plugins/config/neo-tree.lua @@ -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, From e41f25d0dff4872b6e5d1453c55af9223b4ee929 Mon Sep 17 00:00:00 2001 From: fabianmolinab Date: Sun, 1 Oct 2023 15:25:27 -0500 Subject: [PATCH 51/51] feat: activacion del plugin de bufferline y ... - Se activo la barra de buffers para mejorar la experiencia de desarrollo - Algunas nuevas configuraciones de black-indent --- lazy-lock.json | 57 +++++++-------------- lua/plugins/config/black-indent.lua | 3 +- lua/plugins/{desc => config}/bufferline.lua | 0 3 files changed, 20 insertions(+), 40 deletions(-) rename lua/plugins/{desc => config}/bufferline.lua (100%) diff --git a/lazy-lock.json b/lazy-lock.json index 971c111..af47b0b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, + "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" }, @@ -9,65 +10,43 @@ "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "colorizer": { "branch": "master", "commit": "72790a003d5a706c287486a1a81e3a6b32158b54" }, - "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, - "gitsigns.nvim": { "branch": "main", "commit": "fef5d90953f0a730483b44745fae5938ba8227f8" }, -<<<<<<< Updated upstream -<<<<<<< Updated upstream -<<<<<<< Updated upstream + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "e32efa6d6acb4a2e2e270f329df6a65080702066" }, "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" }, -======= ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes - "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, - "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, + "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": "20fd7f50f34b59031a7c3bbc2c207f4f60037628" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "48025d62f45af52ba47e4193b854864839392e4c" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "2d89ca96e08eb6e9c8e50e1bb4738bc5125c9f12" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" }, "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" }, "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" }, -<<<<<<< Updated upstream -<<<<<<< Updated upstream -<<<<<<< Updated upstream -======= - "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, ->>>>>>> Stashed changes -======= - "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, ->>>>>>> Stashed changes -======= - "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, ->>>>>>> Stashed changes - "npairs-integrate-upair": { "branch": "main", "commit": "b3f3b61dc5cc8aadc71cc4b038b34e9e248254dc" }, "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-autopairs": { "branch": "master", "commit": "defad64afbf19381fe31488a7582bbac421d6e38" }, + "nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "0e6b7c47dd70e80793ed39271b2aa712d9366dbc" }, + "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, - "nvim-jdtls": { "branch": "master", "commit": "095dc490f362adc85be66dc14bd9665ddd94413b" }, - "nvim-lspconfig": { "branch": "master", "commit": "d177ad277a638f262edb73c75ffe33e377b95dc5" }, - "nvim-treesitter": { "branch": "master", "commit": "96a50241987531fdb8a516998b72c19f563ccd6c" }, + "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": "ecdeb4e2a4af34fc873bbfbf1f4c4e447e632255" }, - "plenary.nvim": { "branch": "master", "commit": "0232372b906f275f76ac42029eba25eaf95e76b9" }, - "telescope.nvim": { "branch": "master", "commit": "a19770625aed49ad2a9f591a5e3946707f7359f6" }, + "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": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, - "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" }, + "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "cca248f35bb23c38596e7a33ba6cc607ef69f142" }, "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, - "vim-fugitive": { "branch": "master", "commit": "6fcb0ad03982de646e3fecb6915e585651b9a9fb" }, + "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" } diff --git a/lua/plugins/config/black-indent.lua b/lua/plugins/config/black-indent.lua index 925aca4..073be64 100644 --- a/lua/plugins/config/black-indent.lua +++ b/lua/plugins/config/black-indent.lua @@ -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() @@ -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, diff --git a/lua/plugins/desc/bufferline.lua b/lua/plugins/config/bufferline.lua similarity index 100% rename from lua/plugins/desc/bufferline.lua rename to lua/plugins/config/bufferline.lua