Merge pull request #43 from fabianmolinab/linux-wsl

merge linux-wsl a develop
fabianmolinab · Oct 1, 2023 · cd1bf0a · cd1bf0a
2 parents 74876a0 + e41f25d
commit cd1bf0a
Show file tree

Hide file tree

Showing 36 changed files with 697 additions and 508 deletions.
diff --git a/README.md 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).
diff --git a/docs/estructura.md b/docs/estructura.md
diff --git a/docs/list-errors.md b/docs/list-errors.md
@@ -0,0 +1 @@
+[x] error plugins autopairs not install
diff --git a/ftplugin/java.lua 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/lazy-lock.json b/lazy-lock.json
@@ -1,52 +1,53 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "e77fa9ad0b1f4fc6cddf54e51047e17e90c7d7ed" },
+  "LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" },
+  "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
   "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-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
-  "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": "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": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
+  "gitsigns.nvim": { "branch": "main", "commit": "e32efa6d6acb4a2e2e270f329df6a65080702066" },
+  "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" },
+  "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": "43f2ddf0b5f544d9bb20e24b8ff76b79f2a07ab0" },
-  "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" },
+  "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": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
+  "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
+  "nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" },
   "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" },
+  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
+  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
+  "nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" },
+  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" },
-  "nvim-dap-ui": { "branch": "master", "commit": "749bfe12d1447703899fa823c1c075fbe2d42c24" },
-  "nvim-lspconfig": { "branch": "master", "commit": "427378a03ffc1e1bc023275583a49b1993e524d0" },
-  "nvim-treesitter": { "branch": "master", "commit": "25bdc313c732cb0a2b612b9364eab8dc2acad76a" },
-  "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" },
-  "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" },
-  "ultimate-autopair.nvim": { "branch": "main", "commit": "28592a9fb36473fff5467feb5d728701e6291e3a" },
+  "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" },
+  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-jdtls": { "branch": "master", "commit": "3ca419c52a7c20a2565237db2c110ed68fc7e6f1" },
+  "nvim-lspconfig": { "branch": "master", "commit": "eb1b53162755888ff75e495797071644d983bff7" },
+  "nvim-treesitter": { "branch": "master", "commit": "811e8ba4f37821a9e7fe645573ceac4ee47cd542" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
+  "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "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": "v0.6", "commit": "cca248f35bb23c38596e7a33ba6cc607ef69f142" },
   "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-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/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
@@ -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', '<up>', '<nop>', { noremap = true })
@@ -53,21 +54,23 @@ a.nvim_set_keymap('n', '<leader>sp', ':sp<CR>', { noremap = true })
 -- Limpiar los resultados de búsqueda
 a.nvim_set_keymap('n', '//', ':noh<CR>', { silent = true })
 
--- Telescope
+------ Telescope
 -- Buscar archivos
 a.nvim_set_keymap('n', '<Leader>f', '<cmd>lua require(\'telescope.builtin\').find_files()<cr>', { noremap = true })
 -- Buscar dentro del proyecto cualquier palabra
 a.nvim_set_keymap('n', '<Leader>a', '<cmd>lua require(\'telescope.builtin\').live_grep()<cr>', { noremap = true })
 a.nvim_set_keymap('n', '<Leader>mf', '<cmd>lua require(\'telescope.builtin\').marks()<cr>', { noremap = true })
 -- Lista de commits
-a.nvim_set_keymap('n', '<Leader>ls', '<cmd>lua require(\'telescope.builtin\').git_commits()<cr>', { noremap = true })
+a.nvim_set_keymap('n', '<Leader>co', '<cmd>lua require(\'telescope.builtin\').git_commits()<cr>', { noremap = true })
 -- Buscar archivos de git
 a.nvim_set_keymap('n', '<Leader>ag', '<cmd>lua require(\'telescope.builtin\').git_files()<cr>', { noremap = true })
 -- Lista los archivos o ventanas cerradas
 a.nvim_set_keymap('n', '<Leader>of', '<cmd>lua require(\'telescope.builtin\').oldfiles()<cr>', { noremap = true })
 -- Lista buffers o pestañas abiertos
 a.nvim_set_keymap('n', '<Leader>b', '<cmd>lua require(\'telescope.builtin\').buffers()<cr>', { noremap = true })
 
+--a.nvim_set_keymap('n', '<Leader>p', "<cmd>lua require 'telescope'.extensions.file_browser.file_browser()<CR>", {noremap = true})
+------
 -- Todo Busqueda telescope
 a.nvim_set_keymap('n', '<leader>td', ':TodoTelescope<CR>', {})
 
@@ -99,5 +102,5 @@ a.nvim_set_keymap('n', '<leader>ds', ':DapTerminate<CR>', { noremap = true })
 a.nvim_set_keymap('n', '<leader>du', ':lua require("dapui").toggle()<CR>', { noremap = true })
 
 -- Neotree
-a.nvim_set_keymap('n', '<leader>p', ':NeoTreeFocusToggle<CR>', { noremap = true })
-a.nvim_set_keymap('n', '<leader>g', ':NeoTreeFocusToggle git_status<CR>', { noremap = true })
+a.nvim_set_keymap('n', '<leader>p', ':Neotree toggle focus<CR>', { noremap = true })
+a.nvim_set_keymap('n', '<leader>g', ':Neotree toggle focus git_status<CR>', { noremap = true })
diff --git a/lua/core/settings/clipwsl.lua b/lua/core/settings/clipwsl.lua
@@ -0,0 +1,15 @@
+--Permite Copiar y pegar por fuera y por dentro en WSL2
+local globals = require('globals')
+
+globals.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 → lua/core/settings/init.lua b/lua/core/settings.lua → lua/core/settings/init.lua
@@ -9,6 +9,9 @@ g.mapleader = " "
 opt.encoding = "utf-8"
 opt.mouse = ""
 opt.clipboard = "unnamedplus"
+-- Copiar y pegar en WSL 
+require('core.settings.clipwsl')
+
 opt.errorbells = false
 opt.list = false
 opt.cmdheight = 1

diff --git a/lua/globals.lua b/lua/globals.lua
@@ -0,0 +1,21 @@
+-- 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
+local diagnostics = vim.diagnostics
+
+return {
+  opt = opt,
+  cmd = cmd,
+  g   = g,
+  a   = a,
+  key = key,
+  lsp = lsp,
+  vim   = vim,
+  diagnostics = diagnostics
+}
diff --git a/lua/plugins/config/autopairs.lua b/lua/plugins/config/autopairs.lua
@@ -1,84 +1,72 @@
 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",
-}
+local globals = require('globals')
 
 return {
   {
-    "altermo/npairs-integrate-upair",
-    keys = {
-      { "{",       mode = mode },
-      { "[",       mode = mode },
-      { "(",       mode = mode },
-      { '"',       mode = mode },
-      { "'",       mode = mode },
-      { "`",       mode = mode },
-      { "<CR>",    mode = "i" },
-      { "<BS>",    mode = "i" },
-      { "<A-e>",   mode = "i" },
-      { "<A-E>",   mode = "i" },
-      { "<A-]>",   mode = "i" },
-      { "<A-C-e>", mode = "i" },
-      { "<Space>", mode = "i" },
-    },
-    dependencies = {
-      { "windwp/nvim-autopairs",          dependencies = "nvim-treesitter/nvim-treesitter" },
-      { "altermo/ultimate-autopair.nvim", dependencies = "nvim-treesitter/nvim-treesitter" },
+    {
+      "windwp/nvim-autopairs",
+      keys = {
+        { "<M-e>", mode = "i" },
+        { "<CR>", mode = "i" },
+        { "{", mode = "i" },
+        { "[", mode = "i" },
+        { "(", mode = "i" },
+        { '"', mode = "i" },
+        { "'", mode = "i" },
+        { "`", mode = "i" },
+        { "<", mode = "i" },
+      },
+      lazy = true,
+      init = function()
+        globals.a.nvim_create_autocmd("User", {
+          pattern = "IntPairsComp",
+          callback = function()
+            require("cmp").event:on("confirm_done", require("nvim-autopairs.completion.cmp").on_confirm_done())
+          end,
+          once = true,
+        })
+      end,
+      config = function()
+        require("nvim-autopairs").setup({
+          map_bs = false,
+          disable_filetype = {"checkhealth", "help", "lazy", "man", "netrw", "qf" },
+          check_ts = true,
+          fast_wrap = { highlight = "Question", highlight_grey = "LspCodeLens" },
+        })
+      end,
     },
-    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())
+    {
+      "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
-
-          return true
-        end,
-        once = true,
-      })
-    end,
+        end)
+      end,
+    },
+  },
+  {
+    "altermo/ultimate-autopair.nvim",
+    keys = {
+      { "<A-)>", mode = mode },
+      { "<BS>", mode = mode },
+      { "<Space>", mode = mode },
+      { "{", mode = "c" },
+      { "[", mode = "c" },
+      { "(", mode = "c" },
+      { '"', mode = "c" },
+      { "'", mode = "c" },
+      { "`", mode = "c" },
+    },
+    lazy = true,
     config = function()
-      local ignored_file_types = {}
-      local disable = { disable = true }
-
-      for _, filetype in pairs(uifiletypes) do
-        ignored_file_types[filetype] = disable
-      end
-
-      require("npairs-int-upair").setup({
-        bs = "u",
-        npairs_conf = {
-          disable_filetype = uifiletypes,
-          check_ts = true,
-          fast_wrap = { highlight = "Question", highlight_grey = "Dimmed" },
-        },
-        upair_conf = { internal_pairs = { ft = ignored_file_types } },
+      require("ultimate-autopair").setup({
+        pair_map = false,
+        cr = { enable = false },
+        space2 = { enable = true },
+        fastwarp = { enable = false },
       })
     end,
   },