Merge Develop

init.lua

@@ -1,24 +1,2 @@
 local core = require("core")
 local lazy = require("plugins.lazy")
-
-
---[[
-  TODO:
-  - [] Documentación en Español
- - [x] Terminar la confuración de todos los plugins restantes
- - [x] Hacer la configuración de autoformateo de go y js
- - [x] Realizar el menu de temas
- - [x] Mejorar la configuración de lazy
- - [x] Configuracion de cmp inicial
- - [x] Configuracion de algunos plugins de treesitter
- - [x] Autopairs plugin de treesitter
- PLUGINS:
-  -x git-signs
-  -x vim-visual-multi
-  -x markdown-preview
-  -x debuger
-
- FIX: -[x] Error en los TABS de cmp
-      - Esta viendo la carpeta node_modules
---]]
---

lazy-lock.json

@@ -24,7 +24,6 @@
   "neogen": { "branch": "main", "commit": "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901" },
   "nerdcommenter": { "branch": "master", "commit": "1fe9e1cfea9bb0dbc77174d776759ed67899ee50" },
   "nerdterm": { "branch": "main", "commit": "5fa91afa32acbcc58a492d3dd59a8aef8d71295a" },
-  "nightfox.nvim": { "branch": "main", "commit": "a53ff3f99c3cf4e598c5febad367fd3cad341b90" },
   "npairs-integrate-upair": { "branch": "main", "commit": "9e898dcb1d648796663791b78ae348161c4031f8" },
   "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" },
   "null-ls.nvim": { "branch": "main", "commit": "33b853a3933eed3137cd055aac4e539e69832ad0" },
@@ -46,6 +45,7 @@
   "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" }

lua/plugins/config/cmp.lua

@@ -91,7 +91,8 @@ return {
             },
           },
           { name = 'luasnip',     keyword_length = 1, priority = 1 },
-          { name = 'cmp_tabnine', keyword_length = 1, },
+          { name = 'cmp_tabnine', keyword_length = 1, priority = 2 },
+          { name = 'emmet', keyword_length = 1, priority = 5 },
           { name = 'emoji' },
         },
         window = {
@@ -109,25 +110,6 @@ return {
           { max_item_count = 10 },
         })
       })
-
-      -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
-      cmp.setup.cmdline('/', {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = {
-          { name = 'buffer' }
-        }
-      })
-
-      -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-      cmp.setup.cmdline(':', {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources({
-          { name = 'path' }
-        }, {
-          { name = 'cmdline' }
-        })
-      })
-
       --Autopairs
       cmp.event:on(
         'confirm_done',

lua/plugins/config/lsp/config_lsp.lua

@@ -148,7 +148,7 @@ require('lspconfig')['jsonls'].setup {
 --})
 
 
--- Errors hover LSP
+-- Diagnosticos de LSP
 vim.diagnostic.config({
   --underline = true,
   virtual_text = false,
@@ -160,5 +160,17 @@ vim.diagnostic.config({
   }
 })
 
+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
+
 -- Show line diagnostics automatically in hover window
 vim.o.updatetime = 250

lua/plugins/config/lualine.lua

@@ -1,6 +1,6 @@
 return {
   "nvim-lualine/lualine.nvim",
-  dependencies = { "kyazdani42/nvim-web-devicons" },
+  dependencies = { "nvim-tree/nvim-web-devicons" },
   config = function()
     require('lualine').setup {
       options = {

lua/plugins/config/markdown-preview.lua

@@ -5,7 +5,7 @@ return {
   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", "edge")
+    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")
   end,

lua/plugins/config/neo-tree.lua

@@ -1,6 +1,6 @@
 return {
   "nvim-neo-tree/neo-tree.nvim",
-  dependencies = { "nvim-lua/plenary.nvim", "kyazdani42/nvim-web-devicons", "MunifTanjim/nui.nvim" },
+  dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", "MunifTanjim/nui.nvim" },
   --deactivate = function() vim.api.nvim_command("Neotree close") end,
   config = function()
     require("neo-tree").setup({

lua/plugins/config/tab-nine.lua

@@ -5,13 +5,9 @@ return {
     lazy = true,
     dependencies = "hrsh7th/nvim-cmp",
     build = "./install.sh",
-    init = function()
-      vim.api.nvim_create_autocmd("BufRead", {
-        callback = function() require("cmp_tabnine"):prefetch(vim.api.nvim_call_function("expand", { "%:p" })) end,
-      })
-    end,
     config = function()
-      require("cmp_tabnine.config").setup({
+      local tabnine = require('cmp_tabnine.config')
+      tabnine.setup({
         ignored_file_types = {
           ["aerial"] = true,
           ["checkhealth"] = true,
@@ -28,7 +24,6 @@ return {
           ["noice"] = true,
           ["notify"] = true,
           ["null-ls-info"] = true,
-          ["packer"] = true,
           ["qf"] = true,
           ["TelescopePrompt"] = true,
         },

lua/plugins/config/telescope.lua

@@ -2,7 +2,7 @@ return {
   "nvim-telescope/telescope.nvim",
   dependencies = {
     { "nvim-lua/plenary.nvim" },
-    { "kyazdani42/nvim-web-devicons" },
+    { "nvim-tree/nvim-web-devicons" },
   },
   keys = {
     { "<leader>f",  function() require("telescope.builtin").find_files() end },

lua/plugins/config/todo-comments.lua

@@ -3,9 +3,9 @@ return {
   dependencies = {
     "nvim-telescope/telescope.nvim", 
     "nvim-lua/plenary.nvim",
-    {    
+    {
       "folke/trouble.nvim",
-      dependencies = "kyazdani42/nvim-web-devicons",
+      dependencies = "nvim-tree/nvim-web-devicons",
     }
   },
   keys = {

lua/plugins/config/web-devicons.lua

@@ -1,5 +1,5 @@
 return {
-    "kyazdani42/nvim-web-devicons",
+    'nvim-tree/nvim-web-devicons',
     config = function()
         if vim.g.loaded_devicons == nil then
             return

lua/plugins/misc/bufferline.lua

@@ -1,16 +1,22 @@
-vim.opt.termguicolors = true
-require("bufferline").setup({
-   options = {
-      buffer_close_icon = '',
-      indicator = { icon = '', style = 'icon' },
-      --separator_style = 'padded',
-      max_name_length = 13,
-      max_prefix_length = 13,
-      tab_size = 15,
-      diagnostics = 'nvim_lsp',
-      diagnostics_update_in_insert = false,
-      diagnostics_indicator = function(count, level, diagnostics_dict, context)
-          return "("..count..")"
-       end,
-  }
-})
+return {
+  'akinsho/bufferline.nvim',
+  dependencies = 'nvim-tree/nvim-web-devicons',
+  config = function ()
+      vim.opt.termguicolors = true
+      require("bufferline").setup({
+        options = {
+          buffer_close_icon = '',
+          indicator = { icon = '', style = 'icon' },
+          --separator_style = 'padded',
+          max_name_length = 13,
+          max_prefix_length = 13,
+          tab_size = 15,
+          diagnostics = 'nvim_lsp',
+          diagnostics_update_in_insert = false,
+          diagnostics_indicator = function(count, level, diagnostics_dict, context)
+            return "("..count..")"
+          end,
+        }
+      })
+    end
+}

lua/themes/enfocado.lua

@@ -1,7 +1,7 @@
 return {
   "wuelnerdotexe/vim-enfocado",
-  lazy = true,
-  enabled = false,
+  lazy = false,
+  enabled = true,
   priority = 1000,
   init = function()
     vim.api.nvim_set_var("enfocado_plugins", {

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({

lua/themes/zenbones.lua

@@ -15,10 +15,10 @@ return {
     --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.g.nordbones = { transparent_background = true }
 
-    --vim.cmd "colorscheme neobones"
+    vim.cmd "colorscheme neobones"
     --vim.cmd "colorscheme tokyobones"
     --vim.cmd "colorscheme kanagawabones"
     --vim.cmd "colorscheme randombones"