Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cec748bfda | ||
|
|
a52eda2915 |
27 changed files with 359 additions and 507 deletions
|
|
@ -1,2 +0,0 @@
|
||||||
vim.opt.sw=2
|
|
||||||
vim.opt.ts=2
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
vim.opt.sw=2
|
|
||||||
vim.opt.ts=2
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
vim.opt.sw=2
|
|
||||||
vim.opt.ts=2
|
|
||||||
5
init.lua
5
init.lua
|
|
@ -1,7 +1,2 @@
|
||||||
-- nvim-linux64/share/nvim/runtime/lua/vim/lsp.lua:354 is setting this keymap
|
|
||||||
-- before my LazyVim keymap.lua, and then it takes priority over my own keymap;
|
|
||||||
-- setting it to anything here prevents that from happening.
|
|
||||||
vim.keymap.set("n", "K", function () end)
|
|
||||||
|
|
||||||
-- bootstrap lazy.nvim, LazyVim and your plugins
|
-- bootstrap lazy.nvim, LazyVim and your plugins
|
||||||
require("config.lazy")
|
require("config.lazy")
|
||||||
|
|
|
||||||
107
lazy-lock.json
107
lazy-lock.json
|
|
@ -1,67 +1,50 @@
|
||||||
{
|
{
|
||||||
"LazyVim": { "branch": "main", "commit": "0137a110c14e1d72b59dbb82ba804b568cdc5b18" },
|
"LazyVim": { "branch": "main", "commit": "7c593dce1f37647fddca3a6b5caaf7a94324a064" },
|
||||||
"LuaSnip": { "branch": "master", "commit": "659c4479529a05cc9b05ef762639a09d366cc690" },
|
"LuaSnip": { "branch": "master", "commit": "a13af80734eb28f744de6c875330c9d3c24b5f3b" },
|
||||||
"SchemaStore.nvim": { "branch": "main", "commit": "dbf93f5074efe788a3c0a80c6680d9b9b64953b2" },
|
"bufferline.nvim": { "branch": "main", "commit": "02d795081e6a24ec1fd506c513491543793d0780" },
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" },
|
"catppuccin": { "branch": "main", "commit": "233c4175780d9b4e39ae4fe4535c1e4c14bd76ed" },
|
||||||
"catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" },
|
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
"cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
|
||||||
|
"cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "023f795dbcf32d4351b6a9ed2e613d471b5bb812" },
|
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
|
||||||
"crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
|
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
|
"friendly-snippets": { "branch": "main", "commit": "b471f5419155ce832eff71ad8920ea8cfbd54840" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
|
"gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "9521fe8be39255b9abc6ec54e352bf04c410f5cf" },
|
"lazy.nvim": { "branch": "main", "commit": "f145e6f42a56306c5536e9efbfe41f7efbec285d" },
|
||||||
"grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" },
|
"leap.nvim": { "branch": "main", "commit": "14b5a65190fe69388a8f59c695ed3394a10d6af8" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
|
"lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
|
"mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
|
||||||
"lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" },
|
"mini.ai": { "branch": "main", "commit": "44d7df1340b16b16b27b67fba07028cb57f45408" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
|
"mini.bufremove": { "branch": "main", "commit": "14805473144fffbd019d07e51bed2d176e065ee9" },
|
||||||
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
|
"mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
|
"mini.nvim": { "branch": "main", "commit": "296ebbbd3e5ba5e43f5125efe18ad76fe3b632cc" },
|
||||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
|
"mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
"neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" },
|
||||||
"mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" },
|
"neoconf.nvim": { "branch": "main", "commit": "4cfa8a11e4de565c95636643db77b44f926f4f25" },
|
||||||
"mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
|
"neodev.nvim": { "branch": "main", "commit": "a24a910ad0842be997f34a4811c10b4f92aa53af" },
|
||||||
"mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
|
"nui.nvim": { "branch": "main", "commit": "d5a82aae64426a805e19d8ef5a379292f9dc55d3" },
|
||||||
"mini.nvim": { "branch": "main", "commit": "7b4d5d48b6b5a75009d63f8f3e4ef4819b7e8139" },
|
"null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" },
|
||||||
"mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" },
|
"nvim-cmp": { "branch": "main", "commit": "b5a636d46c69bb371995c22d7a10ee1544004879" },
|
||||||
"neo-tree.nvim": { "branch": "main", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
|
"nvim-lspconfig": { "branch": "master", "commit": "0f598b9ab9f2a6d7e137074be99c8d89af44b990" },
|
||||||
"noice.nvim": { "branch": "main", "commit": "ca2e3fea9fb080dcb79d9129d73dac631294fe79" },
|
"nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
|
"nvim-spectre": { "branch": "master", "commit": "1abe23ec9b7bc3082164f4cb842d521ef70e080e" },
|
||||||
"nvim-ansible": { "branch": "main", "commit": "44dabdaa8a9193b7f564a8408ed6d7107705030a" },
|
"nvim-treesitter": { "branch": "master", "commit": "2c59e0ff3da6514b03d853ebecb6c36c515a5d7d" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
|
"nvim-treesitter-textobjects": { "branch": "master", "commit": "2d6d3c7e49a24f6ffbbf7898241fefe9784f61bd" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "6bf4de67dbe90271608e1c81797e5edc79ec6335" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
|
||||||
"nvim-dap-python": { "branch": "master", "commit": "3e3dd98d4d83715c9e0e429b4a5da7bd706e6ceb" },
|
"nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
|
"persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
|
||||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
|
"plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" },
|
||||||
"nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" },
|
"telescope.nvim": { "branch": "master", "commit": "991d5db62451ee7a50944b84aaad4b58c3447b60" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "d2d153a179ed59aa7134d7ebdf4d7dcb156efa22" },
|
"todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
|
"tokyonight.nvim": { "branch": "main", "commit": "161114bd39b990995e08dbf941f6821afbdcd666" },
|
||||||
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
|
"trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" },
|
||||||
"nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
|
"typescript.nvim": { "branch": "main", "commit": "5b3680e5c386e8778c081173ea0c978c14a40ccb" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "6389ceb1758b8f62a15194e3b790e33268304cb8" },
|
|
||||||
"nvim-treesitter-context": { "branch": "master", "commit": "158377d700596367a91ea41818f76abdbf75a232" },
|
|
||||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" },
|
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
|
|
||||||
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
|
|
||||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
|
||||||
"repolink.nvim": { "branch": "master", "commit": "55edfedbaef3e894d2ab5107ea7fadc64cb8258d" },
|
|
||||||
"rustaceanvim": { "branch": "master", "commit": "8ece53be36515cb9e76f3d03511643636469502d" },
|
|
||||||
"snacks.nvim": { "branch": "main", "commit": "14c787540828946126f2acb5e542dc57956c2711" },
|
|
||||||
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
|
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
|
|
||||||
"telescope-terraform-doc.nvim": { "branch": "main", "commit": "28efe1f3cb2ed4c83fa69000ae8afd2f85d62826" },
|
|
||||||
"telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" },
|
|
||||||
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
|
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
|
|
||||||
"tokyonight.nvim": { "branch": "main", "commit": "9758827c3b380ba89da4a2212b6255d01afbcf08" },
|
|
||||||
"trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
|
|
||||||
"ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" },
|
|
||||||
"venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" },
|
|
||||||
"vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
|
"vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
|
||||||
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" },
|
"vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
|
||||||
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
|
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
|
"vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
|
||||||
|
"vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" },
|
||||||
|
"which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" }
|
||||||
}
|
}
|
||||||
25
lazyvim.json
25
lazyvim.json
|
|
@ -1,25 +0,0 @@
|
||||||
{
|
|
||||||
"extras": [
|
|
||||||
"lazyvim.plugins.extras.coding.mini-surround",
|
|
||||||
"lazyvim.plugins.extras.dap.core",
|
|
||||||
"lazyvim.plugins.extras.formatting.black",
|
|
||||||
"lazyvim.plugins.extras.formatting.prettier",
|
|
||||||
"lazyvim.plugins.extras.lang.ansible",
|
|
||||||
"lazyvim.plugins.extras.lang.docker",
|
|
||||||
"lazyvim.plugins.extras.lang.helm",
|
|
||||||
"lazyvim.plugins.extras.lang.json",
|
|
||||||
"lazyvim.plugins.extras.lang.python",
|
|
||||||
"lazyvim.plugins.extras.lang.rust",
|
|
||||||
"lazyvim.plugins.extras.lang.tailwind",
|
|
||||||
"lazyvim.plugins.extras.lang.terraform",
|
|
||||||
"lazyvim.plugins.extras.lang.toml",
|
|
||||||
"lazyvim.plugins.extras.lang.typescript",
|
|
||||||
"lazyvim.plugins.extras.lang.yaml",
|
|
||||||
"lazyvim.plugins.extras.ui.mini-indentscope",
|
|
||||||
"lazyvim.plugins.extras.ui.treesitter-context"
|
|
||||||
],
|
|
||||||
"news": {
|
|
||||||
"NEWS.md": "7107"
|
|
||||||
},
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,16 +1,3 @@
|
||||||
-- Autocmds are automatically loaded on the VeryLazy event
|
-- 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
|
-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
|
||||||
-- Add any additional autocmds here
|
-- 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,
|
|
||||||
})
|
|
||||||
|
|
|
||||||
|
|
@ -11,41 +11,123 @@ local opts = { silent = true }
|
||||||
keymap("n", "<Leader>l", "<Nop>", opts)
|
keymap("n", "<Leader>l", "<Nop>", opts)
|
||||||
keymap("n", "<Leader>lz", "<cmd>:Lazy<cr>", { desc = "Lazy" })
|
keymap("n", "<Leader>lz", "<cmd>:Lazy<cr>", { desc = "Lazy" })
|
||||||
|
|
||||||
|
-- --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)
|
||||||
|
--
|
||||||
-- Navigate buffers
|
-- Navigate buffers
|
||||||
for _, mode in ipairs({ "n", "i", "x" }) do
|
keymap("n", "<M-l>", ":BufferLineCycleNext<CR>", opts)
|
||||||
keymap(mode, "<M-l>", "<cmd>BufferLineCycleNext<CR>", opts)
|
keymap("n", "<M-h>", ":BufferLineCyclePrev<CR>", opts)
|
||||||
keymap(mode, "<M-h>", "<cmd>BufferLineCyclePrev<CR>", opts)
|
keymap("i", "<M-l>", ":BufferLineCycleNext<CR>", opts)
|
||||||
end
|
keymap("i", "<M-h>", ":BufferLineCyclePrev<CR>", opts)
|
||||||
|
keymap("x", "<M-l>", ":BufferLineCycleNext<CR>", opts)
|
||||||
|
keymap("x", "<M-h>", ":BufferLineCyclePrev<CR>", opts)
|
||||||
|
|
||||||
keymap("n", "<H>", "<Nop>", opts)
|
keymap("n", "<H>", "<Nop>", opts)
|
||||||
keymap("n", "<L>", "<Nop>", opts)
|
keymap("n", "<L>", "<Nop>", opts)
|
||||||
keymap("n", "<M-L>", ":BufferLineMoveNext<CR>", opts)
|
keymap("n", "<M-L>", ":BufferLineMoveNext<CR>", opts)
|
||||||
keymap("n", "<M-H>", ":BufferLineMovePrev<CR>", opts)
|
keymap("n", "<M-H>", ":BufferLineMovePrev<CR>", opts)
|
||||||
|
|
||||||
function go_to_buffer(buffer)
|
|
||||||
return function()
|
|
||||||
require("bufferline").go_to(buffer, true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
for _, mode in ipairs({ "n", "i", "v" }) do
|
for _, mode in ipairs({ "n", "i", "v" }) do
|
||||||
for i = 1, 8 do
|
vim.keymap.set(mode, "<A-1>", "<Cmd>BufferLineGoToBuffer 1<CR>", { noremap = true, silent = true })
|
||||||
vim.keymap.set(mode, "<A-" .. i .. ">", go_to_buffer(i), { noremap = true, silent = true })
|
vim.keymap.set(mode, "<A-2>", "<Cmd>BufferLineGoToBuffer 2<CR>", { noremap = true, silent = true })
|
||||||
end
|
vim.keymap.set(mode, "<A-3>", "<Cmd>BufferLineGoToBuffer 3<CR>", { noremap = true, silent = true })
|
||||||
vim.keymap.set(mode, "<A-9>", go_to_buffer(-1), { noremap = true, silent = true })
|
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
|
end
|
||||||
|
--
|
||||||
-- Clear highlights
|
--
|
||||||
keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
|
-- -- Clear highlights
|
||||||
|
-- keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
|
||||||
|
--
|
||||||
-- Close buffers
|
-- Close buffers
|
||||||
keymap("n", "<M-q>", "<cmd>Bdelete<CR>", opts)
|
keymap("n", "<M-q>", "<cmd>Bdelete<CR>", opts)
|
||||||
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 layout
|
-- search with '-', for my LatinAmerican layout
|
||||||
keymap("n", "-", "/", opts)
|
keymap("n", "-", "/", opts)
|
||||||
keymap("x", "-", "/", 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
|
-- disable arrow keys
|
||||||
keymap("n", "<Right>", "<Nop>", opts)
|
keymap("n", "<Right>", "<Nop>", opts)
|
||||||
keymap("n", "<Left>", "<Nop>", opts)
|
keymap("n", "<Left>", "<Nop>", opts)
|
||||||
|
|
@ -55,75 +137,77 @@ keymap("i", "<Right>", "<Nop>", opts)
|
||||||
keymap("i", "<Left>", "<Nop>", opts)
|
keymap("i", "<Left>", "<Nop>", opts)
|
||||||
keymap("i", "<Up>", "<Nop>", opts)
|
keymap("i", "<Up>", "<Nop>", opts)
|
||||||
keymap("i", "<Down>", "<Nop>", opts)
|
keymap("i", "<Down>", "<Nop>", opts)
|
||||||
|
--
|
||||||
local function clean_screen()
|
-- -- move through wrapped lines
|
||||||
vim.o.number = not vim.o.number
|
-- keymap("n", "j", "gj")
|
||||||
if vim.o.number then
|
-- keymap("n", "k", "gk")
|
||||||
if vim.diagnostic.get_next() then
|
--
|
||||||
pcall(vim.diagnostic.show)
|
-- -- use Alt + ijkl to move in insert mode
|
||||||
end
|
-- keymap("i", "<M-l>", "<Right>", opts)
|
||||||
vim.opt.signcolumn = "yes"
|
-- keymap("i", "<M-h>", "<Left>", opts)
|
||||||
vim.g.miniindentscope_disable = false
|
-- keymap("i", "<M-j>", "<C-o>gj", opts)
|
||||||
MiniIndentscope.draw()
|
-- keymap("i", "<M-k>", "<C-o>gk", opts)
|
||||||
vim.cmd("syntax on")
|
--
|
||||||
vim.cmd("IBLEnable")
|
-- local function clean_screen()
|
||||||
else
|
-- vim.o.number = not vim.o.number;
|
||||||
MiniIndentscope.undraw()
|
-- --if not vim.diagnostic.get_next() then return end
|
||||||
vim.g.miniindentscope_disable = true
|
-- if vim.o.number then
|
||||||
if vim.diagnostic.get_next() then
|
-- vim.diagnostic.show()
|
||||||
vim.diagnostic.hide()
|
-- vim.opt.signcolumn = "yes"
|
||||||
end
|
-- vim.cmd("syntax on")
|
||||||
vim.opt.signcolumn = "no"
|
-- else
|
||||||
vim.cmd("syntax off")
|
-- vim.diagnostic.hide()
|
||||||
vim.cmd("IBLDisable")
|
-- vim.opt.signcolumn = "no"
|
||||||
end
|
-- vim.cmd("syntax off")
|
||||||
end
|
-- end
|
||||||
|
-- end
|
||||||
keymap("n", "<leader>n", clean_screen, opts)
|
--
|
||||||
|
-- keymap("n", "<leader>n", clean_screen, opts)
|
||||||
|
|
||||||
function vim.getVisualSelection()
|
function vim.getVisualSelection()
|
||||||
vim.cmd('noau normal! "vy"')
|
vim.cmd('noau normal! "vy"')
|
||||||
local text = vim.fn.getreg("v")
|
local text = vim.fn.getreg('v')
|
||||||
vim.fn.setreg("v", {})
|
vim.fn.setreg('v', {})
|
||||||
|
|
||||||
text = string.gsub(text, "\n", "")
|
text = string.gsub(text, "\n", "")
|
||||||
if #text > 0 then
|
if #text > 0 then
|
||||||
return text
|
return text
|
||||||
else
|
else
|
||||||
return ""
|
return ''
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
keymap("n", "<leader>ghl", "<cmd>RepoLink<CR>", opts)
|
keymap('v', '<space>sw', function()
|
||||||
keymap("x", "<leader>ghl", ":RepoLink<CR>", opts)
|
local tb = require('telescope.builtin')
|
||||||
|
|
||||||
keymap("v", "<space>sw", function()
|
|
||||||
local tb = require("telescope.builtin")
|
|
||||||
local text = vim.getVisualSelection()
|
local text = vim.getVisualSelection()
|
||||||
tb.live_grep({ default_text = text })
|
tb.live_grep({ default_text = text })
|
||||||
end, opts)
|
end, opts)
|
||||||
|
|
||||||
keymap("n", "<S-ScrollWheelDown>", "5zl")
|
--
|
||||||
keymap("n", "<S-ScrollWheelUp>", "5zh")
|
-- local function otherkeymaps()
|
||||||
keymap("i", "<S-ScrollWheelDown>", "5zl")
|
-- local ok
|
||||||
keymap("i", "<S-ScrollWheelUp>", "5zh")
|
-- local wk
|
||||||
keymap("x", "<S-ScrollWheelDown>", "5zl")
|
-- local gs
|
||||||
keymap("x", "<S-ScrollWheelUp>", "5zh")
|
-- ok, wk = pcall(require, "which-key")
|
||||||
|
-- if not ok then
|
||||||
keymap("n", "<leader>j", vim.diagnostic.goto_next, opts)
|
-- return
|
||||||
keymap("n", "<leader>k", vim.diagnostic.goto_prev, opts)
|
-- end
|
||||||
|
-- ok, gs = pcall(require, "gitsigns")
|
||||||
keymap("n", "<F9>", "<cmd>DapToggleBreakpoint<CR>")
|
-- if not ok then
|
||||||
keymap("n", "<F5>", "<cmd>DapContinue<CR>")
|
-- return
|
||||||
keymap("n", "<F10>", "<cmd>DapStepOver<CR>")
|
-- end
|
||||||
keymap("n", "<F11>", "<cmd>DapStepInto<CR>")
|
-- wk.register({
|
||||||
keymap("n", "<S-F11>", "<cmd>DapStepOut<CR>")
|
-- g = {
|
||||||
|
-- name = "gitsigns",
|
||||||
vim.keymap.set("n", "K", require("noice.lsp").hover, { noremap = true, silent = true })
|
-- p = { "<cmd>Gitsigns preview_hunk<cr>", "Preview hunk" },
|
||||||
|
-- b = { function() gs.blame_line{full=false} end, "Blame line (short)" },
|
||||||
local function dismiss_notifications()
|
-- B = { function() gs.blame_line{full=true} end, "Blame line (full)" }
|
||||||
-- require("notify").dismiss({ silent = true, pending = true })
|
-- },
|
||||||
Snacks.notifier.hide()
|
-- prefix = "<leader>"
|
||||||
vim.cmd("noh")
|
-- })
|
||||||
end
|
-- end
|
||||||
vim.keymap.set("n", "<Esc>", dismiss_notifications, { desc = "Dismiss notifications" })
|
-- keymap("n", "<leader>lf", "<cmd>lua vim.lsp.buf.format()<cr>", opts)
|
||||||
|
-- keymap("v", "<leader>lf", "<esc><cmd>'<,'>lua vim.lsp.buf.format{ async = true }<cr>", opts)
|
||||||
|
-- keymap("x", "<leader>lf", "<esc><cmd>'<,'>lua vim.lsp.buf.format{ async = true }<cr>", opts)
|
||||||
|
--
|
||||||
|
-- otherkeymaps()
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,9 @@ require("lazy").setup({
|
||||||
-- add LazyVim and import its plugins
|
-- add LazyVim and import its plugins
|
||||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||||
-- import any extras modules here
|
-- import any extras modules here
|
||||||
-- { import = "lazyvim.plugins.extras.lang.typescript" },
|
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||||
-- { import = "lazyvim.plugins.extras.linting.eslint" },
|
{ import = "lazyvim.plugins.extras.linting.eslint" },
|
||||||
-- { import = "lazyvim.plugins.extras.formatting.prettier" },
|
{ import = "lazyvim.plugins.extras.formatting.prettier" },
|
||||||
-- { import = "lazyvim.plugins.extras.lang.json" },
|
-- { import = "lazyvim.plugins.extras.lang.json" },
|
||||||
-- { import = "lazyvim.plugins.extras.ui.mini-animate" },
|
-- { import = "lazyvim.plugins.extras.ui.mini-animate" },
|
||||||
-- import/override with your plugins
|
-- import/override with your plugins
|
||||||
|
|
@ -37,14 +37,14 @@ require("lazy").setup({
|
||||||
rtp = {
|
rtp = {
|
||||||
-- disable some rtp plugins
|
-- disable some rtp plugins
|
||||||
disabled_plugins = {
|
disabled_plugins = {
|
||||||
-- "gzip",
|
"gzip",
|
||||||
-- "matchit",
|
-- "matchit",
|
||||||
-- "matchparen",
|
-- "matchparen",
|
||||||
-- "netrwPlugin",
|
-- "netrwPlugin",
|
||||||
"tarPlugin",
|
"tarPlugin",
|
||||||
"tohtml",
|
"tohtml",
|
||||||
"tutor",
|
"tutor",
|
||||||
-- "zipPlugin",
|
"zipPlugin",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -9,37 +9,3 @@ vim.opt.list = false
|
||||||
vim.opt.pumblend = 0
|
vim.opt.pumblend = 0
|
||||||
vim.opt.tabstop = 4
|
vim.opt.tabstop = 4
|
||||||
vim.opt.shiftwidth = 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
|
|
||||||
vim.opt.ttimeoutlen = 0
|
|
||||||
vim.opt.termsync = false
|
|
||||||
|
|
||||||
-- local osc52 = require("vim.ui.clipboard.osc52")
|
|
||||||
--
|
|
||||||
-- vim.g.clipboard = {
|
|
||||||
-- name = "OSC 52",
|
|
||||||
-- copy = {
|
|
||||||
-- ["+"] = function(lines)
|
|
||||||
-- vim.g._clipboard = lines
|
|
||||||
-- osc52.copy("+")(lines)
|
|
||||||
-- end,
|
|
||||||
-- ["*"] = function(lines)
|
|
||||||
-- vim.g._clipboard = lines
|
|
||||||
-- osc52.copy("*")(lines)
|
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
-- paste = {
|
|
||||||
-- -- ['+'] = require('vim.ui.clipboard.osc52').paste('+'),
|
|
||||||
-- -- ['*'] = require('vim.ui.clipboard.osc52').paste('*'),
|
|
||||||
-- ["+"] = function()
|
|
||||||
-- return vim.g._clipboard
|
|
||||||
-- end,
|
|
||||||
-- ["*"] = function()
|
|
||||||
-- return vim.g._clipboard
|
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
-- }
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
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,
|
|
||||||
-- },
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +1,7 @@
|
||||||
-- local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
|
local luasnip = require("luasnip")
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{
|
|
||||||
"folke/which-key.nvim",
|
|
||||||
opts = {
|
|
||||||
win = {
|
|
||||||
border = "single",
|
|
||||||
},
|
|
||||||
delay = 1000,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"LazyVim/LazyVim",
|
"LazyVim/LazyVim",
|
||||||
opts = {
|
opts = {
|
||||||
|
|
@ -25,68 +17,75 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"L3MON4D3/LuaSnip",
|
"nvim-neo-tree/neo-tree.nvim",
|
||||||
dependencies = { "rafamadriz/friendly-snippets" },
|
|
||||||
opts = {
|
opts = {
|
||||||
region_check_events = "CursorHold,InsertLeave",
|
window = {
|
||||||
delete_check_events = "TextChanged,InsertEnter,InsertLeave",
|
mappings = {
|
||||||
|
["l"] = "open",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
-- dependencies = {
|
dependencies = {
|
||||||
-- "hrsh7th/cmp-emoji",
|
"hrsh7th/cmp-emoji",
|
||||||
-- },
|
},
|
||||||
--@param opts cmp.ConfigSchema
|
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
local cmp = require("cmp")
|
|
||||||
local luasnip = require("luasnip")
|
|
||||||
local has_words_before = function()
|
local has_words_before = function()
|
||||||
unpack = unpack or table.unpack
|
unpack = unpack or table.unpack
|
||||||
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
|
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
|
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
|
||||||
end
|
end
|
||||||
-- opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } }))
|
|
||||||
opts.window = {
|
opts.mapping = vim.tbl_extend("force", opts.mapping, {
|
||||||
completion = cmp.config.window.bordered(),
|
["<C-k>"] = cmp.mapping.select_prev_item(),
|
||||||
documentation = cmp.config.window.bordered(),
|
["<C-j>"] = cmp.mapping.select_next_item(),
|
||||||
}
|
-- ["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }),
|
||||||
opts.formatting = {
|
-- ["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }),
|
||||||
format = function(entry, vim_item)
|
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
|
||||||
vim_item.abbr = string.sub(vim_item.abbr, 1, 40)
|
-- ["<C-e>"] = cmp.mapping({
|
||||||
return vim_item
|
-- i = cmp.mapping.abort(),
|
||||||
end,
|
-- c = cmp.mapping.close(),
|
||||||
}
|
-- }),
|
||||||
opts.preselect = cmp.PreselectMode.None
|
-- Accept currently selected item. If none selected, `select` first item.
|
||||||
opts.completion = {
|
-- Set `select` to `false` to only confirm explicitly selected items.
|
||||||
completeopt = "menuone,noselect,preview",
|
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
||||||
}
|
-- ["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
opts.mapping = cmp.mapping.preset.insert({
|
-- if cmp.visible() then
|
||||||
["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
-- cmp.select_next_item()
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
-- elseif luasnip.expandable() then
|
||||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
-- luasnip.expand()
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
-- elseif luasnip.expand_or_jumpable() then
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
-- luasnip.expand_or_jump()
|
||||||
["<C-e>"] = cmp.mapping.abort(),
|
-- elseif check_backspace() then
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
-- fallback()
|
||||||
-- ["<CR>"] = cmp.config.disable,
|
-- else
|
||||||
["<S-CR>"] = cmp.mapping.confirm({
|
-- fallback()
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
-- end
|
||||||
select = true,
|
-- end, {
|
||||||
}), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
-- "i",
|
||||||
["<C-CR>"] = function(fallback)
|
-- "s",
|
||||||
cmp.abort()
|
-- }),
|
||||||
fallback()
|
-- ["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||||
end,
|
-- if cmp.visible() then
|
||||||
|
-- cmp.select_prev_item()
|
||||||
|
-- elseif luasnip.jumpable(-1) then
|
||||||
|
-- luasnip.jump(-1)
|
||||||
|
-- else
|
||||||
|
-- fallback()
|
||||||
|
-- end
|
||||||
|
-- end, {
|
||||||
|
-- "i",
|
||||||
|
-- "s",
|
||||||
|
-- }),
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
|
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
|
||||||
-- this way you will only jump inside the snippet region
|
-- this way you will only jump inside the snippet region
|
||||||
-- elseif luasnip.expand_or_locally_jumpable() then
|
elseif luasnip.expand_or_jumpable() then
|
||||||
-- luasnip.expand_or_jump()
|
luasnip.expand_or_jump()
|
||||||
elseif luasnip.expandable() then
|
|
||||||
luasnip.expand()
|
|
||||||
elseif has_words_before() then
|
elseif has_words_before() then
|
||||||
cmp.complete()
|
cmp.complete()
|
||||||
else
|
else
|
||||||
|
|
@ -96,13 +95,41 @@ return {
|
||||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_prev_item()
|
cmp.select_prev_item()
|
||||||
-- elseif luasnip.in_snippet() and luasnip.jumpable(-1) then
|
elseif luasnip.jumpable(-1) then
|
||||||
-- luasnip.jump(-1)
|
luasnip.jump(-1)
|
||||||
else
|
else
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
end, { "i", "s" }),
|
||||||
})
|
})
|
||||||
|
opts.window = {
|
||||||
|
completion = cmp.config.window.bordered(),
|
||||||
|
documentation = cmp.config.window.bordered(),
|
||||||
|
}
|
||||||
|
opts.preselect = cmp.PreselectMode.None
|
||||||
|
opts.completion = {
|
||||||
|
completeopt = "noselect",
|
||||||
|
}
|
||||||
|
|
||||||
|
-- opts.formatting = {
|
||||||
|
-- fields = { "kind", "abbr", "menu" },
|
||||||
|
-- -- format = function(entry, vim_item)
|
||||||
|
-- -- -- vim_item.kind = kind_icons[vim_item.kind]
|
||||||
|
-- -- vim_item.menu = ({
|
||||||
|
-- -- nvim_lsp = "",
|
||||||
|
-- -- nvim_lua = "",
|
||||||
|
-- -- luasnip = "",
|
||||||
|
-- -- buffer = "",
|
||||||
|
-- -- path = "",
|
||||||
|
-- -- emoji = "",
|
||||||
|
-- -- })[entry.source.name]
|
||||||
|
-- -- return vim_item
|
||||||
|
-- -- end,
|
||||||
|
-- }
|
||||||
|
-- opts.confirm_opts = {
|
||||||
|
-- behavior = cmp.ConfirmBehavior.Replace,
|
||||||
|
-- select = false,
|
||||||
|
-- }
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
return {
|
|
||||||
"Saecki/crates.nvim",
|
|
||||||
opts = {
|
|
||||||
popup = {
|
|
||||||
border = "rounded"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
return {
|
return {
|
||||||
{ "echasnovski/mini.nvim", enabled = true },
|
{ "echasnovski/mini.nvim", enabled = true },
|
||||||
{ "echasnovski/mini.pairs", enabled = false },
|
{ "echasnovski/mini.pairs", enabled = false },
|
||||||
{ "echasnovski/mini.bufremove", enabled = false },
|
{ "echasnovski/mini.indentscope", enabled = false },
|
||||||
{ "folke/edgy.nvim", enabled = false },
|
{ "lukas-reineke/indent-blankline.nvim", enabled = false },
|
||||||
{ "folke/flash.nvim", enabled = false },
|
|
||||||
-- { "rcarriga/nvim-notify", enabled = false },
|
|
||||||
{ "goolord/alpha-nvim", enabled = false },
|
{ "goolord/alpha-nvim", enabled = false },
|
||||||
{ "ggandor/leap.nvim", enabled = false },
|
{ "rcarriga/nvim-notify", enabled = false },
|
||||||
{ "ggandor/flit.nvim", enabled = false },
|
{ "ggandor/flit.nvim", enabled = false },
|
||||||
{ "nvimdev/dashboard-nvim", enabled = false },
|
{ "stevearc/dressing.nvim", enabled = false },
|
||||||
|
-- { "folke/neodev.nvim", enabled = false },
|
||||||
|
-- { "nvim-neo-tree/neo-tree.nvim", enabled = false },
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
return {
|
|
||||||
{ "stevearc/dressing.nvim", opts = { input = { insert_only = false } } },
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"j-hui/fidget.nvim",
|
"j-hui/fidget.nvim",
|
||||||
tag = 'legacy',
|
enabled = true,
|
||||||
enabled = false,
|
|
||||||
init = function()
|
init = function()
|
||||||
require("fidget").setup()
|
require("fidget").setup()
|
||||||
end,
|
end,
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
return {
|
|
||||||
-- {
|
|
||||||
-- "vhyrro/luarocks.nvim",
|
|
||||||
-- priority = 1001,
|
|
||||||
-- opts = {
|
|
||||||
-- rocks = { "magick" },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- {
|
|
||||||
-- "3rd/image.nvim",
|
|
||||||
-- dependencies = { "luarocks.nvim" },
|
|
||||||
-- opts = {
|
|
||||||
-- backend = "kitty",
|
|
||||||
-- -- tmux_show_only_in_active_window = true,
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
|
||||||
opts = {
|
|
||||||
indent = { char = "▏" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"echasnovski/mini.indentscope",
|
|
||||||
opts = {
|
|
||||||
symbol = "▏",
|
|
||||||
-- options = { try_as_border = true },
|
|
||||||
draw = {
|
|
||||||
delay = 0,
|
|
||||||
animation = require("mini.indentscope").gen_animation.none(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -3,32 +3,15 @@ return {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
init = function()
|
init = function()
|
||||||
local format = function()
|
local format = function()
|
||||||
require("lazyvim.util").format({ force = true })
|
require("lazyvim.plugins.lsp.format").format({ force = true })
|
||||||
end
|
end
|
||||||
|
|
||||||
local keys = require("lazyvim.plugins.lsp.keymaps").get()
|
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 Document", has = "documentFormatting" }
|
||||||
keys[#keys + 1] = { "<leader>lf", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" }
|
keys[#keys + 1] = { "<leader>lf", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" }
|
||||||
keys[#keys + 1] = { "K", false } -- su puta madre!
|
|
||||||
vim.diagnostic.config({
|
|
||||||
float = { border = "rounded" },
|
|
||||||
})
|
|
||||||
end,
|
end,
|
||||||
opts = {
|
opts = {
|
||||||
diagnostics = {
|
autoformat = false,
|
||||||
update_in_insert = true,
|
|
||||||
},
|
|
||||||
setup = {
|
|
||||||
-- rust_analyzer = function()
|
|
||||||
-- return true
|
|
||||||
-- end,
|
|
||||||
tsserver = function()
|
|
||||||
return false
|
|
||||||
end,
|
|
||||||
vtsls = function()
|
|
||||||
return true
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
servers = {
|
servers = {
|
||||||
yamlls = {
|
yamlls = {
|
||||||
settings = {
|
settings = {
|
||||||
|
|
@ -37,41 +20,6 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
lua_ls = {
|
|
||||||
root_dir = function()
|
|
||||||
return vim.loop.cwd()
|
|
||||||
end,
|
|
||||||
-- ---@type LazyKeys[]
|
|
||||||
-- keys = {},
|
|
||||||
settings = {
|
|
||||||
Lua = {
|
|
||||||
workspace = {
|
|
||||||
checkThirdParty = false,
|
|
||||||
},
|
|
||||||
completion = {
|
|
||||||
callSnippet = "Replace",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
vtsls = { enabled = false },
|
|
||||||
tsserver = {
|
|
||||||
enabled = true,
|
|
||||||
settings = {
|
|
||||||
typescript = {
|
|
||||||
inlayHints = {
|
|
||||||
includeInlayEnumMemberValueHints = true,
|
|
||||||
includeInlayFunctionLikeReturnTypeHints = true,
|
|
||||||
includeInlayFunctionParameterTypeHints = true,
|
|
||||||
includeInlayParameterNameHints = "literals",
|
|
||||||
includeInlayParameterNameHintsWhenArgumentMatchesName = false,
|
|
||||||
includeInlayPropertyDeclarationTypeHints = true,
|
|
||||||
includeInlayVariableTypeHints = false,
|
|
||||||
includeInlayVariableTypeHintsWhenTypeMatchesName = false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"ray-x/lsp_signature.nvim",
|
|
||||||
enabled = true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"nvim-neo-tree/neo-tree.nvim",
|
|
||||||
opts = {
|
|
||||||
window = {
|
|
||||||
mappings = {
|
|
||||||
["l"] = "open", -- open folders and files with l
|
|
||||||
},
|
|
||||||
},
|
|
||||||
use_popups_for_input = false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,46 +1,52 @@
|
||||||
return {
|
return {
|
||||||
"folke/noice.nvim",
|
"folke/noice.nvim",
|
||||||
-- commit = "d9328ef",
|
enabled = false,
|
||||||
enabled = true,
|
|
||||||
opts = {
|
opts = {
|
||||||
cmdline = {
|
cmdline = {
|
||||||
|
enabled = true,
|
||||||
view = "cmdline",
|
view = "cmdline",
|
||||||
format = {
|
format = {
|
||||||
cmdline = { pattern = "^:", icon = ":", lang = "vim" },
|
cmdline = false,
|
||||||
|
search_down = false,
|
||||||
|
search_up = false,
|
||||||
|
filter = false,
|
||||||
|
lua = false,
|
||||||
|
help = false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
views = {
|
messages = {
|
||||||
hover = {
|
enabled = true,
|
||||||
border = { style = "rounded" },
|
|
||||||
-- size = { max_width = 20 },
|
|
||||||
},
|
},
|
||||||
|
popupmenu = {
|
||||||
|
enabled = false,
|
||||||
|
backend = "nui",
|
||||||
},
|
},
|
||||||
presets = {
|
presets = {
|
||||||
bottom_search = true,
|
bottom_search = true,
|
||||||
command_palette = false,
|
command_palette = false,
|
||||||
long_message_to_split = true,
|
long_message_to_split = true,
|
||||||
|
inc_rename = false,
|
||||||
lsp_doc_border = true,
|
lsp_doc_border = true,
|
||||||
},
|
},
|
||||||
routes = {
|
lsp = {
|
||||||
{
|
progress = {
|
||||||
filter = {
|
enabled = true,
|
||||||
event = "notify",
|
|
||||||
find = "Request textDocument/inlayHint failed",
|
|
||||||
},
|
|
||||||
opts = { skip = true },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
filter = {
|
|
||||||
event = "notify",
|
|
||||||
find = "Debug Failure. False expression",
|
|
||||||
},
|
|
||||||
opts = { skip = true },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- lsp = {
|
status = {},
|
||||||
-- progress = {
|
-- views = {
|
||||||
-- enabled = false
|
-- popupmenu = {
|
||||||
-- }
|
-- relative = "cursor",
|
||||||
|
-- position = {
|
||||||
|
-- row = 0,
|
||||||
|
-- col = 0,
|
||||||
-- },
|
-- },
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
-- routes = {
|
||||||
|
-- view = "cmdline",
|
||||||
|
-- filter = {
|
||||||
|
-- }
|
||||||
|
-- }
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"rcarriga/nvim-notify",
|
|
||||||
opts = {
|
|
||||||
-- stages = "fade_in_slide_out",
|
|
||||||
stages = "static",
|
|
||||||
-- render = "compact",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
8
lua/plugins/nvimtree.lua
Normal file
8
lua/plugins/nvimtree.lua
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
return {
|
||||||
|
-- {
|
||||||
|
-- "nvim-tree/nvim-tree.lua",
|
||||||
|
-- },
|
||||||
|
-- {
|
||||||
|
-- "nvim-tree/nvim-web-devicons",
|
||||||
|
-- },
|
||||||
|
}
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"9seconds/repolink.nvim",
|
|
||||||
opts = {
|
|
||||||
use_full_commit_hash = true,
|
|
||||||
bang_register = "+",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
return {
|
|
||||||
-- {
|
|
||||||
-- "jose-elias-alvarez/typescript.nvim",
|
|
||||||
-- opts = {
|
|
||||||
-- init_options = {
|
|
||||||
-- preferences = {
|
|
||||||
-- importModuleSpecifierPreference = "relative",
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"mg979/vim-visual-multi",
|
"mg979/vim-visual-multi",
|
||||||
init = function()
|
-- enabled = true,
|
||||||
vim.g.VM_theme = "olive"
|
-- init = function()
|
||||||
end,
|
-- require("fidget").setup()
|
||||||
|
-- end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue