Merge branch 'ts-dap'

6 files changed, 107 insertions, 32 deletions

diff --git a/lazy-lock.json b/lazy-lock.json
index 3992226..5cec775 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,6 +9,7 @@
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "baleia.nvim": { "branch": "main", "commit": "1b25eac3ac03659c3d3af75c7455e179e5f197f7" },
   "buffer_manager.nvim": { "branch": "main", "commit": "fd36131b2b3e0f03fd6353ae2ffc88cf920b3bbb" },
+  "cmp-ai": { "branch": "main", "commit": "fa08e42144b0f3763d1a3fb81bafc495f769cab8" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
@@ -28,12 +29,12 @@
   "duck.nvim": { "branch": "main", "commit": "d8a6b08af440e5a0e2b3b357e2f78bb1883272cd" },
   "elixir-tools.nvim": { "branch": "main", "commit": "5e7596be469be0800e9cbe3415de971f7286c3d0" },
   "firenvim": { "branch": "master", "commit": "bb70728c13c305ff35193586d5f6ce68668af063" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "de817aaf2f1553db3da3650b196e8936b04e7f14" },
-  "fzf": { "branch": "master", "commit": "cf2242aea30bf709282fb3c6ff8867c0593c3664" },
-  "fzf.vim": { "branch": "master", "commit": "6f28c8c7bb551161a0315a76488522204f39c1f4" },
+  "flutter-tools.nvim": { "branch": "main", "commit": "99af5175096113185179194a7b3878c7bdec5b4e" },
+  "fzf": { "branch": "master", "commit": "fc69308057cf8486d2753efd76682fd613471da6" },
+  "fzf.vim": { "branch": "master", "commit": "c5ce7908ee86af7d4090d2007086444afb6ec1c9" },
   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
-  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" },
+  "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
   "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
   "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
   "image.nvim": { "branch": "main", "commit": "acbd1d7d64ac0643021a6146eb0557e7c2e793d0" },
@@ -51,11 +52,11 @@
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
   "mini.icons": { "branch": "main", "commit": "12e7b5d47bfc1b4c5ba4278fb49ec9100138df14" },
-  "mini.nvim": { "branch": "main", "commit": "a8185957febe7dae31556dbd7326cfa597b812f1" },
+  "mini.nvim": { "branch": "main", "commit": "57e47cf7a2923684e7413989ab267ed9730e7d03" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "neogen": { "branch": "main", "commit": "e932ba918b56723436b77aa3efb844a11b2851ab" },
   "neorg": { "branch": "main", "commit": "85f15f033d8c56366ac1e6ae93c940db8ad067ca" },
-  "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" },
+  "neotest": { "branch": "master", "commit": "6d6ad113f56edc7c3f2a77a0836ea8c1b955ebea" },
   "neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" },
   "neotest-plenary": { "branch": "master", "commit": "2cc925246d7e5324ddf9585fad891cec73c3947b" },
   "neotest-rust": { "branch": "main", "commit": "0418811e1e3499b2501593f2e131d02f5e6823d4" },
@@ -64,7 +65,7 @@
   "none-ls-extras.nvim": { "branch": "main", "commit": "dfdc998a8c7bb728abab156942bd43ed2345845a" },
   "none-ls-luacheck.nvim": { "branch": "main", "commit": "a1dfea0d4c40c4023829c8b9a7ab0a26135985ca" },
   "none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
-  "none-ls.nvim": { "branch": "main", "commit": "cb5bd2ffd81b7a3d264deebfe894388010381dc5" },
+  "none-ls.nvim": { "branch": "main", "commit": "203f5ebde4a1af48ba2eb146401b5be2e7866942" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
   "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
   "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" },
@@ -73,32 +74,32 @@
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
   "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" },
   "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" },
-  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
   "nvim-html-css": { "branch": "main", "commit": "c514bd27ad560636ed39dea3e370b3103754e244" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a7f0f9c18baa70a3970ea18f9984e03b6f6c2e8a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "6bfd9210e312af6cfedba05d272e85618c93ab0d" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
   "nvim-python-repl": { "branch": "main", "commit": "3d63e4f298233cb97e0fb2d8360857120235112f" },
   "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" },
-  "nvim-transparent": { "branch": "main", "commit": "2c78d94448b534c35ca1d88a3bae90b1cd1a3d4d" },
-  "nvim-treesitter": { "branch": "master", "commit": "8724e7d028ba11604dde94dc4be63f70cccf16e0" },
+  "nvim-transparent": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" },
+  "nvim-treesitter": { "branch": "master", "commit": "585860a1865853d2c287c8ef534297da8115818e" },
   "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" },
   "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
   "oil-git-status.nvim": { "branch": "main", "commit": "a7ea816bac0cc3b8b4c3605e2f2b87960be60a05" },
   "oil-image-preview.nvim": { "branch": "master", "commit": "6183f23ba094283c04f00ae060cc45e59a4c3441" },
-  "oil.nvim": { "branch": "master", "commit": "a632c898fbe0e363ef89b9577f1a7714ab67d682" },
-  "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" },
+  "oil.nvim": { "branch": "master", "commit": "0dc98d36b5450575e3af97fdfc6dcb72ba1fc80e" },
+  "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "phpactor.nvim": { "branch": "main", "commit": "0aa4ad09c2024e24d630c0ec616d65396caa39e0" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" },
-  "rustaceanvim": { "branch": "master", "commit": "7cba8e599deca98d4b44cac1bcbd720c62937d90" },
-  "smart-splits.nvim": { "branch": "master", "commit": "b518cfb5283a2da43fa9935e850ba9d77873453d" },
+  "rustaceanvim": { "branch": "master", "commit": "d3a8b145f0b3db4de9a08fcbc604659f52ee4fbc" },
+  "smart-splits.nvim": { "branch": "master", "commit": "e5209df1aa04ee2d4910a25a289efe5a978dba2f" },
   "solarized-osaka.nvim": { "branch": "main", "commit": "126d394c0c979a99206214a2b6b8c86e456c9c0f" },
   "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "a46780830b576049c675680650f773bedfa8677a" },
@@ -114,7 +115,7 @@
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
   "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "0f51d8de368c8c6220973e8acd156d17da746f4c" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "2f344874918a3ab6bbe68fb866b3f003a639a5d2" },
   "vim-dispatch": { "branch": "master", "commit": "4c695bc052cad2ae6b980aebbe48d046466e27ae" },
   "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
   "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
@@ -125,6 +126,6 @@
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vim-test": { "branch": "master", "commit": "75b64f23c923d34b56e47846a026210feb57146a" },
+  "vim-test": { "branch": "master", "commit": "2c9cef3f7605fc1b272b23765c5872607c1b6183" },
   "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }
 }
diff --git a/lua/config/options.lua b/lua/config/options.lua
index 1400d03..af53cb8 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -26,7 +26,7 @@ opt.hidden = true
 opt.expandtab = true
 
 -- Configura el ancho de la tabulación y la indentación.
-opt.tabstop = 4
+opt.tabstop = 2
 opt.softtabstop = 4
 opt.shiftwidth = 4
 
diff --git a/lua/pi/completition/init.lua b/lua/pi/completition/init.lua
index ec128a0..5b9fd18 100644
--- a/lua/pi/completition/init.lua
+++ b/lua/pi/completition/init.lua
@@ -55,13 +55,14 @@ cmp.setup {
     ["<c-space>"] = cmp.mapping.complete(),
   },
   sources = {
-    { name = "dictionary", keyword_length = 2},
+    -- { name = "dictionary", keyword_length = 2},
     { name = "nvim_lua" },
     { name = "nvim_lsp" },
     { name = "path" },
     { name = "luasnip" },
     { name = "copilot" },
     {name = "codeium"},
+    { name = 'cmp_ai' },
     { name = 'html-css',
         option = {
           max_count = {}, -- not ready yet
@@ -109,6 +110,7 @@ cmp.setup {
       local KIND_ICONS = {
         Tailwind = '󰹞󰹞󰹞󰹞󰹞󰹞󰹞󰹞',
         Copilot = "",
+        Ollama = "",
         Text = "󰉿",
         Method = "󰆧",
         Function = "󰊕",
@@ -135,6 +137,9 @@ cmp.setup {
         Operator = "󰆕",
         Codeium = "",
         TypeParameter = "󰜅",
+        OpenAI = "",
+        TinyLlama = "󱝊",
+        LlamaCPP = ""
       }
 
       if vim_item.kind == 'Color' and entry.completion_item.documentation then
@@ -179,6 +184,10 @@ cmp.setup {
 
 vim.api.nvim_set_hl(0, "CmpItemKindCopilot", { fg = "#3426C3" })
 vim.api.nvim_set_hl(0, "CmpItemKindCodeium", { fg = "#2ACDBA" })
+vim.api.nvim_set_hl(0, "CmpItemKindOllama", { fg = "#FDFEFF" })
+vim.api.nvim_set_hl(0, "CmpItemKindOpenAI", { fg = "#080808" })
+vim.api.nvim_set_hl(0, "CmpItemKindTinyLlama", { fg = "#DF468C"})
+vim.api.nvim_set_hl(0, "CmpItemKindLlamaCPP", { fg = "#FF8235"})
 
 -- Set configuration for specific filetype.
 cmp.setup.filetype("gitcommit", {
diff --git a/lua/pi/dap/configs/javascript.lua b/lua/pi/dap/configs/javascript.lua
index 03173ba..ef616f1 100644
--- a/lua/pi/dap/configs/javascript.lua
+++ b/lua/pi/dap/configs/javascript.lua
@@ -4,17 +4,23 @@ dap.adapters.firefox = {
   command = 'firefox-debug-adapter',
 }
 
-dap.configurations.typescript = {
-  {
-  name = 'Debug with Firefox',
-  type = 'firefox',
-  request = 'launch',
-  reAttach = true,
-  url = 'http://localhost:3010',
-  webRoot = '${workspaceFolder}',
-  firefoxExecutable = '/home/elvis/.local/bin/firefox'
-  },
-}
+for _, language in ipairs({ "typescript", "javascript", "javascriptreact", "typescriptreact" }) do
+  dap.configurations[language] = {
+    {
+    name = 'Debug with Firefox',
+    type = 'firefox',
+    request = 'launch',
+    reAttach = true,
+    url = 'http://localhost:5173',
+    webRoot = '${workspaceFolder}',
+    firefoxExecutable = '/home/elvis/.local/bin/firefox',
+    -- firefoxArgs = {'-start-debugger-server', '--new-instance'},
+    enableCRAWorkaround = true,
+    liftAccessorsFromPrototypes = 3,
+    },
+  }
+end
+
 -- require("dap-vscode-js").setup {
 --   debugger_cmd = { "js-debug-adapter" },
 --   adapters = { "pwa-node", "pwa-chrome", "node-terminal" },
diff --git a/lua/pi/lsp/default.lua b/lua/pi/lsp/default.lua
index 8a47cbf..ff5c97e 100644
--- a/lua/pi/lsp/default.lua
+++ b/lua/pi/lsp/default.lua
@@ -9,7 +9,7 @@ return {
     html = { enable = true },
     jsonls = { enable = true },
     lua_ls = { enable = true, neodev = true },
-    nil_ls = { enable = true },
+    -- nil_ls = { enable = true },
     phpactor = {enable = true },
     rust_analyzer = { enable = true },
     svelte = { enable = true },
diff --git a/lua/plugins/cmp-ai.lua b/lua/plugins/cmp-ai.lua
new file mode 100644
index 0000000..5431187
--- /dev/null
+++ b/lua/plugins/cmp-ai.lua
@@ -0,0 +1,59 @@
+return {
+  "ElvisClaros/cmp-ai",
+  dependencies = "nvim-lua/plenary.nvim",
+  config = function()
+    local cmp_ai = require "cmp_ai.config"
+    cmp_ai:setup {
+      max_lines = 10,
+      provider = "LlamaCPP",
+      provider_options = {
+        model = "null",
+      },
+      notify = false,
+      notify_callback = function(msg)
+        vim.notify(msg)
+      end,
+      run_on_every_keystroke = true,
+      ignored_file_types = {
+        -- default is not to ignore
+        -- uncomment to ignore in lua:
+        -- lua = true
+      },
+    }
+
+    -- cmp_ai:setup {
+    --   max_lines = 10,
+    --   provider = "Ollama",
+    --   provider_options = {
+    --     model = "tinyllama:1.1b",
+    --   },
+    --   notify = false,
+    --   notify_callback = function(msg)
+    --     vim.notify(msg)
+    --   end,
+    --   run_on_every_keystroke = true,
+    --   ignored_file_types = {
+    --     -- default is not to ignore
+    --     -- uncomment to ignore in lua:
+    --     -- lua = true
+    --   },
+    -- }
+    -- cmp_ai:setup {
+    --   max_lines = 10,
+    --   provider = "OpenAI",
+    --   provider_options = {
+    --     model = "gpt-4",
+    --   },
+    --   notify = true,
+    --   notify_callback = function(msg)
+    --     vim.notify(msg)
+    --   end,
+    --   run_on_every_keystroke = true,
+    --   ignored_file_types = {
+    --     -- default is not to ignore
+    --     -- uncomment to ignore in lua:
+    --     -- lua = true
+    --   },
+    -- }
+  end,
+}