update

after/ftplugin/c.lua

@@ -0,0 +1,2 @@
+vim.opt.sw=2
+vim.opt.ts=2

after/ftplugin/help.lua

@@ -0,0 +1 @@
+vim.opt_local.conceallevel = 0

after/ftplugin/html.lua

@@ -0,0 +1,2 @@
+vim.opt.sw=2
+vim.opt.ts=2

after/ftplugin/lua.lua

@@ -0,0 +1,2 @@
+vim.opt.sw=2
+vim.opt.ts=2

lazy-lock.json

@@ -1,52 +1,62 @@
 {
-  "LazyVim": { "branch": "main", "commit": "b1b5b461bf9d853d8472ee5b968471695118958b" },
-  "LuaSnip": { "branch": "master", "commit": "836d4f5a9970819b60b1010fd8709a2ff88416d8" },
-  "alpha-nvim": { "branch": "main", "commit": "906649c3991903d14cef8fae1fe5557193ca743c" },
-  "bufferline.nvim": { "branch": "main", "commit": "3677aceb9a72630b0613e56516c8f7151b86f95c" },
-  "catppuccin": { "branch": "main", "commit": "a2bb81951ef18137d4e25a7972f234937f5ee747" },
+  "LazyVim": { "branch": "main", "commit": "530e94a9fa19577401e968a9673282c3d79f01e3" },
+  "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
+  "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" },
+  "catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },
-  "flit.nvim": { "branch": "main", "commit": "4c1739137acd3e7f03e2065a7be8a4dc41c7e461" },
-  "friendly-snippets": { "branch": "main", "commit": "009887b76f15d16f69ae1341f86a7862f61cf2a1" },
-  "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
-  "lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" },
-  "leap.nvim": { "branch": "main", "commit": "d34680b16af977928228e57c68e5a162f1649e3c" },
-  "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a31e011135a79d63c71254c250c9158e1056a1cb" },
-  "mason.nvim": { "branch": "main", "commit": "a8cef27f071fe34696a9c8fa55829900e2291e86" },
-  "mini.ai": { "branch": "main", "commit": "ce822c6e6fe3aaf7cb29874e669b2d96febc97e5" },
-  "mini.bufremove": { "branch": "main", "commit": "8464390c932556dbb298ccf8a7587d6ef765e94f" },
-  "mini.comment": { "branch": "main", "commit": "5e8c7f75c48d958ef84ed75772b0263284c8621d" },
-  "mini.indentscope": { "branch": "main", "commit": "7998edc970610c05598c7aea3d21ece8dd87ed52" },
-  "mini.pairs": { "branch": "main", "commit": "0256717c9364ad6b5384c37b4f96fb4f7cc74867" },
-  "mini.surround": { "branch": "main", "commit": "b7c2f4bea1f60af8dfee71f696319d045d986ce6" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4" },
-  "neoconf.nvim": { "branch": "main", "commit": "64df472e5dad68749c5181d87dd8a4b7525db167" },
-  "neodev.nvim": { "branch": "main", "commit": "50eaabc6645b43ded9126f97080bff767063b1c6" },
-  "noice.nvim": { "branch": "main", "commit": "c22651651da01239fc4afac4cdb7261797d5f02e" },
-  "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" },
-  "null-ls.nvim": { "branch": "main", "commit": "900c38cfa91eb7ff2716da70f2f2c1d33741cf0a" },
-  "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" },
-  "nvim-lspconfig": { "branch": "master", "commit": "f3e6c034d103e3476821af596a67df71d76f85a9" },
-  "nvim-navic": { "branch": "master", "commit": "cdd24539bcf114a499827e9b32869fe74836efe7" },
-  "nvim-notify": { "branch": "master", "commit": "281e4d793c550c866bea3fb85d39de1f0188fb50" },
-  "nvim-spectre": { "branch": "master", "commit": "b71b64afe9fedbfdd25a8abec897ff4af3bd553a" },
-  "nvim-treesitter": { "branch": "master", "commit": "d086563c02a582a552086ea94bfabd5f49d6872a" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "f5f13206ec33e55b16c8e1a9dec301e8bead4835" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4af94fec29f508159ceab5413383e5dedd6c24e3" },
-  "persistence.nvim": { "branch": "main", "commit": "adcf6913693a0434665d162ee45a186230496f8a" },
-  "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
-  "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" },
-  "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" },
-  "tokyonight.nvim": { "branch": "main", "commit": "3ebc29df627c5cf70eb6acb8f0843c9ea9cf6348" },
-  "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" },
-  "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" },
-  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "vim-startuptime": { "branch": "master", "commit": "6580cf539c33a212f4f5542068a3b4dd2b3ad834" },
-  "which-key.nvim": { "branch": "main", "commit": "fb027738340502b556c3f43051f113bcaa7e8e63" }
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "conform.nvim": { "branch": "master", "commit": "6dc1603ea408f476a57937bbeaf7f86520a21a98" },
+  "crates.nvim": { "branch": "main", "commit": "7d8541ec0e3b30ac2c43864d3ee13a632e1231ed" },
+  "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
+  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
+  "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "cc68881d19095c46ffcfc48a5fd6f7ab20885c10" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
+  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
+  "mini.ai": { "branch": "main", "commit": "55e9b7217f29e62f734e239bfeed5731a065d801" },
+  "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" },
+  "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
+  "mini.nvim": { "branch": "main", "commit": "5df3155218807fb6049779bb488f48f77fdd9dcb" },
+  "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
+  "neoconf.nvim": { "branch": "main", "commit": "d4a48c2a6fdeec138605cee4eb6f8c6fafd0b3ed" },
+  "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
+  "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
+  "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" },
+  "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
+  "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
+  "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
+  "nvim-lint": { "branch": "master", "commit": "83ee4952a968d89329e5a49b4648831d98124783" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" },
+  "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
+  "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
+  "nvim-treesitter": { "branch": "master", "commit": "707b0dcf7641fa3a2aaad5053b215503f54f89aa" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
+  "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
+  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "rustaceanvim": { "branch": "master", "commit": "2eb8776df1aab03f514b38ddc39af57efbd8970b" },
+  "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
+  "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" },
+  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
+  "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" },
+  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "venv-selector.nvim": { "branch": "main", "commit": "9b1bfe5aea225853e14358f504c656d4af007035" },
+  "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
+  "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" },
+  "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
+  "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }

lazyvim.json

@@ -0,0 +1,15 @@
+{
+  "extras": [
+    "lazyvim.plugins.extras.dap.core",
+    "lazyvim.plugins.extras.formatting.black",
+    "lazyvim.plugins.extras.formatting.prettier",
+    "lazyvim.plugins.extras.lang.python",
+    "lazyvim.plugins.extras.lang.rust",
+    "lazyvim.plugins.extras.lang.tailwind",
+    "lazyvim.plugins.extras.lang.typescript"
+  ],
+  "news": {
+    "NEWS.md": "3314"
+  },
+  "version": 3
+}

lua/config/autocmds.lua

@@ -1,3 +1,16 @@
 -- Autocmds are automatically loaded on the VeryLazy event
 -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
 -- Add any additional autocmds here
+
+-- stop snippets when you leave to normal mode
+vim.api.nvim_create_autocmd({ "ModeChanged" }, {
+  callback = function()
+    if
+      ((vim.v.event.old_mode == "s" and vim.v.event.new_mode == "n") or vim.v.event.old_mode == "i")
+      and require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
+      and not require("luasnip").session.jump_active
+    then
+      require("luasnip").unlink_current()
+    end
+  end,
+})

lua/config/keymaps.lua

@@ -7,34 +7,16 @@ local keymap = vim.keymap.set
 -- Silent keymap option
 local opts = { silent = true }
 
--- --Remap space as leader key
--- keymap("", "<Space>", "<Nop>", opts)
--- vim.g.mapleader = " "
---
--- -- Modes
--- --   normal_mode = "n",
--- --   insert_mode = "i",
--- --   visual_mode = "v",
--- --   visual_block_mode = "x",
--- --   term_mode = "t",
--- --   command_mode = "c",
---
--- -- Normal --
--- -- Better window navigation
--- keymap("n", "<C-h>", "<C-w>h", opts)
--- keymap("n", "<C-j>", "<C-w>j", opts)
--- keymap("n", "<C-k>", "<C-w>k", opts)
--- keymap("n", "<C-l>", "<C-w>l", opts)
---
--- -- Resize with arrows
--- keymap("n", "<C-Up>", ":resize -2<CR>", opts)
--- keymap("n", "<C-Down>", ":resize +2<CR>", opts)
--- keymap("n", "<C-Left>", ":vertical resize -2<CR>", opts)
--- keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts)
---
+-- Remap LazyVim
+keymap("n", "<Leader>l", "<Nop>", opts)
+keymap("n", "<Leader>lz", "<cmd>:Lazy<cr>", { desc = "Lazy" })
+
 -- Navigate buffers
-keymap("n", "<M-l>", ":BufferLineCycleNext<CR>", opts)
-keymap("n", "<M-h>", ":BufferLineCyclePrev<CR>", opts)
+for _, mode in ipairs({ "n", "i", "x" }) do
+  keymap(mode, "<M-l>", "<cmd>BufferLineCycleNext<CR>", opts)
+  keymap(mode, "<M-h>", "<cmd>BufferLineCyclePrev<CR>", opts)
+end
+
 keymap("n", "<H>", "<Nop>", opts)
 keymap("n", "<L>", "<Nop>", opts)
 keymap("n", "<M-L>", ":BufferLineMoveNext<CR>", opts)
@@ -46,136 +28,80 @@ for _, mode in ipairs({ "n", "i", "v" }) do
   vim.keymap.set(mode, "<A-4>", "<Cmd>BufferLineGoToBuffer 4<CR>", { noremap = true, silent = true })
   vim.keymap.set(mode, "<A-5>", "<Cmd>BufferLineGoToBuffer 5<CR>", { noremap = true, silent = true })
 end
---
---
--- -- Clear highlights
--- keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
---
--- -- Close buffers
--- keymap("n", "<M-q>", "<cmd>Bdelete<CR>", opts)
--- keymap("n", "<M-Q>", "<cmd>Bdelete!<CR>", opts)
---
--- -- Better paste
--- keymap("x", "p", '"_dP', opts)
---
--- -- Insert --
--- -- Press jk fast to enter
--- --keymap("i", "jk", "<ESC>", opts)
---
--- -- Visual --
--- -- Stay in indent mode
--- keymap("v", "<", "<gv", opts)
--- keymap("v", ">", ">gv", opts)
---
--- -- search with '-', for my LatinAmerican layour
--- keymap("n", "-", "/", opts)
--- keymap("x", "-", "/", opts)
---
--- -- Plugins --
---
--- -- NvimTree
--- keymap("n", "<leader>e", ":NvimTreeToggle<CR>", opts)
---
--- -- Telescope
--- keymap("n", "<leader>fa", ":Telescope find_files<CR>", opts)
--- keymap("n", "<leader>ff", ":Telescope git_files<CR>", opts)
--- keymap("n", "<leader>ft", ":Telescope live_grep<CR>", opts)
--- keymap("n", "<leader>fp", ":Telescope projects<CR>", opts)
--- keymap("n", "<leader>fb", ":Telescope buffers<CR>", opts)
--- keymap("n", "<leader>fs", ":Telescope grep_string<CR>", opts)
--- keymap("n", "<leader>fr", ":Telescope oldfiles<CR>", opts)
---
--- -- Git
--- --keymap("n", "<leader>gg", "<cmd>lua _LAZYGIT_TOGGLE()<CR>", opts)
---
--- -- Comment
--- keymap("n", "<leader>/", "<cmd>lua require('Comment.api').toggle_current_linewise()<cr>", opts)
--- keymap("x", "<leader>/", '<esc><cmd>lua require("Comment.api").toggle_linewise_op(vim.fn.visualmode())<cr>')
---
--- -- DAP
--- keymap("n", "<F9>", "<cmd>lua require'dap'.toggle_breakpoint()<cr>", opts)
--- keymap("n", "<F5>", "<cmd>lua require'dap'.continue()<cr>", opts)
--- keymap("n", "<F10>", "<cmd>lua require'dap'.step_over()<cr>", opts)
--- keymap("n", "<F11>", "<cmd>lua require'dap'.step_into()<cr>", opts)
--- keymap("n", "<F23>", "<cmd>lua require'dap'.step_out()<cr>", opts)
--- keymap("n", "<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>", opts)
--- keymap("n", "<leader>dl", "<cmd>lua require'dap'.run_last()<cr>", opts)
--- keymap("n", "<leader>du", "<cmd>lua require'dapui'.toggle()<cr>", opts)
--- keymap("n", "<F17>", "<cmd>lua require'dap'.terminate()<cr>", opts) -- Shift+F5
---
--- ---- Vimspector
--- --keymap("n", "<F9>", "<Plug>VimspectorToggleBreakpoint", opts)
--- --keymap("n", "<F5>", "<plug>VimspectorContinue", opts)
--- --keymap("n", "<F10>", "<Plug>VimspectorStepOver", opts)
--- --keymap("n", "<F11>", "<Plug>VimspectorStepInto", opts)
--- --keymap("n", "<F23>", "<Plug>VimspectorStepOut", opts)
--- --keymap("n", "<F17>", "<cmd>VimspectorReset<cr>", opts)  -- Shift+F5
--- --keymap("n", "<F41>", "<Plug>VimspectorRestart", opts)  -- Ctrl+Shift+F5
--- --keymap("n", "<leader>di", "<Plug>VimspectorBalloonEval", opts)
---
--- -- move.nvim
--- keymap('n', '<M-J>', ':MoveLine(1)<cr>', opts)
--- keymap('n', '<M-K>', ':MoveLine(-1)<cr>', opts)
--- keymap('x', '<M-J>', ':MoveBlock(1)<cr>', opts)
--- keymap('x', '<M-K>', ':MoveBlock(-1)<cr>', opts)
---
--- -- disable arrow keys
--- keymap("n", "<Right>", "<Nop>", opts)
--- keymap("n", "<Left>", "<Nop>", opts)
--- keymap("n", "<Up>", "<Nop>", opts)
--- keymap("n", "<Down>", "<Nop>", opts)
--- keymap("i", "<Right>", "<Nop>", opts)
--- keymap("i", "<Left>", "<Nop>", opts)
--- keymap("i", "<Up>", "<Nop>", opts)
--- keymap("i", "<Down>", "<Nop>", opts)
---
--- -- move through wrapped lines
--- keymap("n", "j", "gj")
--- keymap("n", "k", "gk")
---
--- -- use Alt + ijkl to move in insert mode
--- keymap("i", "<M-l>", "<Right>", opts)
--- keymap("i", "<M-h>", "<Left>", opts)
--- keymap("i", "<M-j>", "<C-o>gj", opts)
--- keymap("i", "<M-k>", "<C-o>gk", opts)
---
--- local function clean_screen()
---     vim.o.number = not vim.o.number;
---     --if not vim.diagnostic.get_next() then return end
---     if vim.o.number then
---         vim.diagnostic.show()
---         vim.opt.signcolumn = "yes"
---         vim.cmd("syntax on")
---     else
---         vim.diagnostic.hide()
---         vim.opt.signcolumn = "no"
---         vim.cmd("syntax off")
---     end
--- end
---
--- keymap("n", "<leader>n", clean_screen, opts)
---
--- local function otherkeymaps()
---     local ok
---     local wk
---     local gs
---     ok, wk = pcall(require, "which-key")
---     if not ok then
---         return
---     end
---     ok, gs = pcall(require, "gitsigns")
---     if not ok then
---         return
---     end
---     wk.register({
---       g = {
---         name = "gitsigns",
---         p = { "<cmd>Gitsigns preview_hunk<cr>", "Preview hunk" },
---         b = { function() gs.blame_line{full=false} end, "Blame line (short)" },
---         B = { function() gs.blame_line{full=true} end, "Blame line (full)" }
---       },
---       prefix = "<leader>"
---     })
--- end
---
--- otherkeymaps()
+
+-- Clear highlights
+keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
+
+-- Close buffers
+keymap("n", "<M-q>", "<cmd>Bdelete<CR>", opts)
+keymap("n", "<M-Q>", "<cmd>Bdelete!<CR>", opts)
+
+-- search with '-', for my LatinAmerican layout
+keymap("n", "-", "/", opts)
+keymap("x", "-", "/", opts)
+
+-- disable arrow keys
+keymap("n", "<Right>", "<Nop>", opts)
+keymap("n", "<Left>", "<Nop>", opts)
+keymap("n", "<Up>", "<Nop>", opts)
+keymap("n", "<Down>", "<Nop>", opts)
+keymap("i", "<Right>", "<Nop>", opts)
+keymap("i", "<Left>", "<Nop>", opts)
+keymap("i", "<Up>", "<Nop>", opts)
+keymap("i", "<Down>", "<Nop>", opts)
+
+local function clean_screen()
+  vim.o.number = not vim.o.number
+  if vim.o.number then
+    if vim.diagnostic.get_next()
+    then
+      pcall(vim.diagnostic.show)
+    end
+    vim.opt.signcolumn = "yes"
+    vim.g.miniindentscope_disable = false
+    MiniIndentscope.draw()
+    vim.cmd("syntax on")
+    vim.cmd("IBLEnable")
+  else
+    MiniIndentscope.undraw()
+    vim.g.miniindentscope_disable = true
+    if vim.diagnostic.get_next()
+    then
+      vim.diagnostic.hide()
+    end
+    vim.opt.signcolumn = "no"
+    vim.cmd("syntax off")
+    vim.cmd("IBLDisable")
+  end
+end
+
+keymap("n", "<leader>n", clean_screen, opts)
+
+function vim.getVisualSelection()
+  vim.cmd('noau normal! "vy"')
+  local text = vim.fn.getreg("v")
+  vim.fn.setreg("v", {})
+
+  text = string.gsub(text, "\n", "")
+  if #text > 0 then
+    return text
+  else
+    return ""
+  end
+end
+
+keymap("v", "<space>sw", function()
+  local tb = require("telescope.builtin")
+  local text = vim.getVisualSelection()
+  tb.live_grep({ default_text = text })
+end, opts)
+
+keymap("n", "<S-ScrollWheelDown>", "5zl")
+keymap("n", "<S-ScrollWheelUp>", "5zh")
+keymap("i", "<S-ScrollWheelDown>", "5zl")
+keymap("i", "<S-ScrollWheelUp>", "5zh")
+keymap("x", "<S-ScrollWheelDown>", "5zl")
+keymap("x", "<S-ScrollWheelUp>", "5zh")
+
+keymap("n", "<leader>j", vim.diagnostic.goto_next, opts)
+keymap("n", "<leader>k", vim.diagnostic.goto_prev, opts)

lua/config/lazy.lua

@@ -12,6 +12,8 @@ require("lazy").setup({
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
     -- import any extras modules here
     -- { import = "lazyvim.plugins.extras.lang.typescript" },
+    -- { import = "lazyvim.plugins.extras.linting.eslint" },
+    -- { import = "lazyvim.plugins.extras.formatting.prettier" },
     -- { import = "lazyvim.plugins.extras.lang.json" },
     -- { import = "lazyvim.plugins.extras.ui.mini-animate" },
     -- import/override with your plugins
@@ -27,19 +29,22 @@ require("lazy").setup({
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
   install = { colorscheme = { "tokyonight", "habamax" } },
-  checker = { enabled = true }, -- automatically check for plugin updates
+  checker = { enabled = true, notify = false }, -- automatically check for plugin updates
+  change_detection = {
+    notify = false,
+  },
   performance = {
     rtp = {
       -- disable some rtp plugins
       disabled_plugins = {
-        "gzip",
+        -- "gzip",
         -- "matchit",
         -- "matchparen",
         -- "netrwPlugin",
         "tarPlugin",
         "tohtml",
         "tutor",
-        "zipPlugin",
+        -- "zipPlugin",
       },
     },
   },

lua/config/options.lua

@@ -1,3 +1,17 @@
 -- Options are automatically loaded before lazy.nvim startup
 -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
 -- Add any additional options here
+
+vim.opt.relativenumber = false
+vim.opt.conceallevel = 0
+vim.opt.timeoutlen = 1000
+vim.opt.list = false
+vim.opt.pumblend = 0
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
+vim.g.autoformat = false
+vim.opt.completeopt = "menuone,noselect,preview"
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+vim.opt.foldenable = false
+vim.opt.exrc = true

lua/plugins/bbye.lua

@@ -0,0 +1,5 @@
+return {
+  {
+    "moll/vim-bbye",
+  },
+}

lua/plugins/catppuccin.lua

@@ -0,0 +1,24 @@
+return {
+  -- {
+  --   "catppuccin/nvim",
+  --   name = "catppuccin",
+  --   dependencies = {
+  --     "mg979/vim-visual-multi",
+  --   },
+  --   priority = 1000,
+  --   config = function()
+  --     require("catppuccin").setup({
+  --       custom_highlights = function(colors)
+  --         print("fuuuuuuuuuuuuuuuuuuuck", colors.red)
+  --         return {
+  --           TreesitterContext = { bg = colors.mantle },
+  --           TreesitterContextLineNumber = { bg = colors.mantle },
+  --           TreesitterContextBottom = { style = { "underline" } },
+  --           MultiCursor = { bg = colors.red },
+  --           VM_Cursor = { bg = colors.red },
+  --         }
+  --       end,
+  --     })
+  --   end,
+  -- },
+}

lua/plugins/core.lua

@@ -1,8 +1,165 @@
+-- local cmp = require("cmp")
+
 return {
+  {
+    "folke/which-key.nvim",
+    opts = {
+      window = {
+        border = "single",
+      },
+    },
+  },
   {
     "LazyVim/LazyVim",
     opts = {
       colorscheme = "catppuccin",
     },
   },
+  {
+    "nvim-lualine/lualine.nvim",
+    opts = {
+      sections = {
+        lualine_z = {},
+      },
+    },
+  },
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    opts = {
+      window = {
+        mappings = {
+          ["l"] = "open", -- open folders and files with l
+          -- ["h"] = "close",
+        },
+      },
+      use_popups_for_input = false,
+    },
+  },
+  {
+    "L3MON4D3/LuaSnip",
+    dependencies = { "rafamadriz/friendly-snippets" },
+    opts = {
+      region_check_events = "CursorHold,InsertLeave",
+      delete_check_events = "TextChanged,InsertEnter,InsertLeave",
+    },
+  },
+  {
+    "hrsh7th/nvim-cmp",
+    -- dependencies = {
+    --   "hrsh7th/cmp-emoji",
+    -- },
+    --@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      local cmp = require("cmp")
+      local luasnip = require("luasnip")
+      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
+      end
+      -- opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } }))
+      opts.window = {
+        completion = cmp.config.window.bordered(),
+        documentation = cmp.config.window.bordered(),
+      }
+      opts.formatting = {
+        format = function(entry, vim_item)
+          vim_item.abbr = string.sub(vim_item.abbr, 1, 40)
+          return vim_item
+        end,
+      }
+      opts.preselect = cmp.PreselectMode.None
+      opts.completion = {
+        completeopt = "menuone,noselect,preview",
+      }
+      opts.mapping = cmp.mapping.preset.insert({
+        ["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+        ["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
+        ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+        ["<C-f>"] = cmp.mapping.scroll_docs(4),
+        ["<C-Space>"] = cmp.mapping.complete(),
+        ["<C-e>"] = cmp.mapping.abort(),
+        ["<CR>"] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+        -- ["<CR>"] = cmp.config.disable,
+        ["<S-CR>"] = cmp.mapping.confirm({
+          behavior = cmp.ConfirmBehavior.Replace,
+          select = true,
+        }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+        ["<C-CR>"] = function(fallback)
+          cmp.abort()
+          fallback()
+        end,
+        ["<Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_next_item()
+          -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+          -- this way you will only jump inside the snippet region
+          -- elseif luasnip.expand_or_locally_jumpable() then
+          --   luasnip.expand_or_jump()
+          elseif luasnip.expandable() then
+            luasnip.expand()
+          elseif has_words_before() then
+            cmp.complete()
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+        ["<S-Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_prev_item()
+          -- elseif luasnip.in_snippet() and luasnip.jumpable(-1) then
+          --   luasnip.jump(-1)
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+      })
+    end,
+  },
+  -- opts = function(_, opts)
+  --   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
+  --   end
+  --
+  --   opts.mapping = vim.tbl_extend("force", opts.mapping, {
+  --     ["<C-k>"] = cmp.mapping.select_prev_item(),
+  --     ["<C-j>"] = cmp.mapping.select_next_item(),
+  --     ["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
+  --     -- Accept currently selected item. If none selected, `select` first item.
+  --     -- Set `select` to `false` to only confirm explicitly selected items.
+  --     ["<CR>"] = cmp.mapping.confirm({ select = false }),
+  --     ["<Tab>"] = cmp.mapping(function(fallback)
+  --       if cmp.visible() then
+  --         cmp.select_next_item()
+  --       -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+  --       -- this way you will only jump inside the snippet region
+  --       elseif luasnip.expand_or_locally_jumpable() then
+  --         luasnip.expand_or_jump()
+  --       elseif has_words_before() then
+  --         cmp.complete()
+  --       else
+  --         fallback()
+  --       end
+  --     end, { "i", "s" }),
+  --     ["<S-Tab>"] = cmp.mapping(function(fallback)
+  --       if cmp.visible() then
+  --         cmp.select_prev_item()
+  --       elseif luasnip.jumpable(-1) then
+  --         luasnip.jump(-1)
+  --       else
+  --         fallback()
+  --       end
+  --     end, { "i", "s" }),
+  --   })
+  --   opts.window = {
+  --     completion = cmp.config.window.bordered(),
+  --     documentation = cmp.config.window.bordered(),
+  --   }
+  --   opts.preselect = cmp.PreselectMode.None
+  --   opts.completion = {
+  --     completeopt = "noselect",
+  --   }
+  -- end,
 }

lua/plugins/disabled.lua

@@ -0,0 +1,13 @@
+return {
+  { "echasnovski/mini.nvim", enabled = true },
+  { "echasnovski/mini.pairs", enabled = false },
+  { "echasnovski/mini.bufremove", enabled = false },
+  { "folke/edgy.nvim", enabled = false },
+  { "folke/flash.nvim", enabled = false },
+  { "rcarriga/nvim-notify", enabled = false },
+  { "goolord/alpha-nvim", enabled = false },
+  { "ggandor/leap.nvim", enabled = false },
+  { "ggandor/flit.nvim", enabled = false },
+  { "nvimdev/dashboard-nvim", enabled = false },
+  { "folke/noice.nvim", enabled = false },
+}

lua/plugins/dressing.lua

@@ -0,0 +1,3 @@
+return {
+  { "stevearc/dressing.nvim", opts = { input = { insert_only = false } } },
+}

lua/plugins/example.lua

@@ -1,267 +0,0 @@
--- since this is just an example spec, don't actually load anything here and return an empty spec
--- stylua: ignore
-if true then return {} end
-
--- every spec file under config.plugins will be loaded automatically by lazy.nvim
---
--- In your plugin files, you can:
--- * add extra plugins
--- * disable/enabled LazyVim plugins
--- * override the configuration of LazyVim plugins
-return {
-  -- add gruvbox
-  { "ellisonleao/gruvbox.nvim" },
-
-  -- Configure LazyVim to load gruvbox
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "gruvbox",
-    },
-  },
-
-  -- change trouble config
-  {
-    "folke/trouble.nvim",
-    -- opts will be merged with the parent spec
-    opts = { use_diagnostic_signs = true },
-  },
-
-  -- disable trouble
-  { "folke/trouble.nvim", enabled = false },
-
-  -- add symbols-outline
-  {
-    "simrat39/symbols-outline.nvim",
-    cmd = "SymbolsOutline",
-    keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
-    config = true,
-  },
-
-  -- override nvim-cmp and add cmp-emoji
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = { "hrsh7th/cmp-emoji" },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      local cmp = require("cmp")
-      opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } }))
-    end,
-  },
-
-  -- change some telescope options and a keymap to browse plugin files
-  {
-    "nvim-telescope/telescope.nvim",
-    keys = {
-      -- add a keymap to browse plugin files
-      -- stylua: ignore
-      {
-        "<leader>fp",
-        function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
-        desc = "Find Plugin File",
-      },
-    },
-    -- change some options
-    opts = {
-      defaults = {
-        layout_strategy = "horizontal",
-        layout_config = { prompt_position = "top" },
-        sorting_strategy = "ascending",
-        winblend = 0,
-      },
-    },
-  },
-
-  -- add telescope-fzf-native
-  {
-    "telescope.nvim",
-    dependencies = {
-      "nvim-telescope/telescope-fzf-native.nvim",
-      build = "make",
-      config = function()
-        require("telescope").load_extension("fzf")
-      end,
-    },
-  },
-
-  -- add pyright to lspconfig
-  {
-    "neovim/nvim-lspconfig",
-    ---@class PluginLspOpts
-    opts = {
-      ---@type lspconfig.options
-      servers = {
-        -- pyright will be automatically installed with mason and loaded with lspconfig
-        pyright = {},
-      },
-    },
-  },
-
-  -- add tsserver and setup with typescript.nvim instead of lspconfig
-  {
-    "neovim/nvim-lspconfig",
-    dependencies = {
-      "jose-elias-alvarez/typescript.nvim",
-      init = function()
-        require("lazyvim.util").on_attach(function(_, buffer)
-          -- stylua: ignore
-          vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
-          vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
-        end)
-      end,
-    },
-    ---@class PluginLspOpts
-    opts = {
-      ---@type lspconfig.options
-      servers = {
-        -- tsserver will be automatically installed with mason and loaded with lspconfig
-        tsserver = {},
-      },
-      -- you can do any additional lsp server setup here
-      -- return true if you don't want this server to be setup with lspconfig
-      ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
-      setup = {
-        -- example to setup with typescript.nvim
-        tsserver = function(_, opts)
-          require("typescript").setup({ server = opts })
-          return true
-        end,
-        -- Specify * to use this function as a fallback for any server
-        -- ["*"] = function(server, opts) end,
-      },
-    },
-  },
-
-  -- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
-  -- treesitter, mason and typescript.nvim. So instead of the above, you can use:
-  { import = "lazyvim.plugins.extras.lang.typescript" },
-
-  -- add more treesitter parsers
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = {
-      ensure_installed = {
-        "bash",
-        "help",
-        "html",
-        "javascript",
-        "json",
-        "lua",
-        "markdown",
-        "markdown_inline",
-        "python",
-        "query",
-        "regex",
-        "tsx",
-        "typescript",
-        "vim",
-        "yaml",
-      },
-    },
-  },
-
-  -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
-  -- would overwrite `ensure_installed` with the new value.
-  -- If you'd rather extend the default config, use the code below instead:
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      -- add tsx and treesitter
-      vim.list_extend(opts.ensure_installed, {
-          "tsx",
-          "typescript",
-      })
-    end,
-  },
-
-  -- the opts function can also be used to change the default opts:
-  {
-    "nvim-lualine/lualine.nvim",
-    event = "VeryLazy",
-    opts = function(_, opts)
-      table.insert(opts.sections.lualine_x, "😄")
-    end,
-  },
-
-  -- or you can return new options to override all the defaults
-  {
-    "nvim-lualine/lualine.nvim",
-    event = "VeryLazy",
-    opts = function()
-      return {
-        --[[add your custom lualine config here]]
-      }
-    end,
-  },
-
-  -- use mini.starter instead of alpha
-  { import = "lazyvim.plugins.extras.ui.mini-starter" },
-
-  -- add jsonls and schemastore ans setup treesitter for json, json5 and jsonc
-  { import = "lazyvim.plugins.extras.lang.json" },
-
-  -- add any tools you want to have installed below
-  {
-    "williamboman/mason.nvim",
-    opts = {
-      ensure_installed = {
-        "stylua",
-        "shellcheck",
-        "shfmt",
-        "flake8",
-      },
-    },
-  },
-
-  -- Use <tab> for completion and snippets (supertab)
-  -- first: disable default <tab> and <s-tab> behavior in LuaSnip
-  {
-    "L3MON4D3/LuaSnip",
-    keys = function()
-      return {}
-    end,
-  },
-  -- then: setup supertab in cmp
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = {
-      "hrsh7th/cmp-emoji",
-    },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      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
-      end
-
-      local luasnip = require("luasnip")
-      local cmp = require("cmp")
-
-      opts.mapping = vim.tbl_extend("force", opts.mapping, {
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-            -- they way you will only jump inside the snippet region
-          elseif luasnip.expand_or_jumpable() then
-            luasnip.expand_or_jump()
-          elseif has_words_before() then
-            cmp.complete()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
-            luasnip.jump(-1)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      })
-    end,
-  },
-}

lua/plugins/fidget.lua

@@ -0,0 +1,10 @@
+return {
+  {
+    "j-hui/fidget.nvim",
+    tag = 'legacy',
+    enabled = true,
+    init = function()
+      require("fidget").setup()
+    end,
+  },
+}

lua/plugins/indentscope.lua

@@ -0,0 +1,16 @@
+return {
+  {
+    "lukas-reineke/indent-blankline.nvim",
+    enabled = true,
+  },
+  {
+    "echasnovski/mini.indentscope",
+    enabled = true,
+    opts = {
+      draw = {
+        delay = 0,
+        animation = require("mini.indentscope").gen_animation.none(),
+      },
+    },
+  },
+}

lua/plugins/lsp.lua

@@ -0,0 +1,66 @@
+return {
+  {
+    "neovim/nvim-lspconfig",
+    init = function()
+      local format = function()
+        require("lazyvim.util").format({ force = true })
+      end
+
+      local keys = require("lazyvim.plugins.lsp.keymaps").get()
+      keys[#keys + 1] = { "<leader>lf", format, desc = "Format Document", has = "documentFormatting" }
+      keys[#keys + 1] = { "<leader>lf", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" }
+      vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded" })
+      vim.lsp.handlers["textDocument/signatureHelp"] =
+        vim.lsp.with(vim.lsp.handlers.signature_help, { border = "rounded" })
+      vim.diagnostic.config({
+        float = { border = "rounded" },
+      })
+    end,
+    opts = {
+      -- autoformat = false,
+      diagnostics = {
+        update_in_insert = true,
+      },
+      servers = {
+        yamlls = {
+          settings = {
+            yaml = {
+              keyOrdering = false,
+            },
+          },
+        },
+        rust_analyzer = {
+          settings = {
+            ["rust-analyzer"] = {
+              checkOnSave = {
+                command = "clippy",
+              },
+            },
+          },
+        },
+        lua_ls = {
+          -- mason = false, -- set to false if you don't want this server to be installed with mason
+          -- Use this to add any additional keymaps
+          -- for specific lsp servers
+          root_dir = function()
+            -- local Path = require('plenary.path')
+            -- return Path:new(fname):parent().filename
+            return vim.loop.cwd()
+          end,
+          -- ---@type LazyKeys[]
+          -- keys = {},
+          settings = {
+            Lua = {
+              workspace = {
+                checkThirdParty = false,
+              },
+              completion = {
+                callSnippet = "Replace",
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+}

lua/plugins/lsp_signature.lua

@@ -0,0 +1,6 @@
+return {
+  {
+    "ray-x/lsp_signature.nvim",
+    enabled = true,
+  },
+}

lua/plugins/typescript.lua

@@ -0,0 +1,12 @@
+return {
+  -- {
+  --   "jose-elias-alvarez/typescript.nvim",
+  --   opts = {
+  --     init_options = {
+  --       preferences = {
+  --         importModuleSpecifierPreference = "relative",
+  --       },
+  --     },
+  --   },
+  -- },
+}

lua/plugins/vim-visual-multi.lua

@@ -0,0 +1,8 @@
+return {
+  {
+    "mg979/vim-visual-multi",
+    init = function()
+      vim.g.VM_theme = "olive"
+    end,
+  },
+}