diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 46dc2ba..3ae6d1a 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,54 +1,54 @@ { - "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, - "SchemaStore.nvim": { "branch": "main", "commit": "6af106298a8fd50af775d5281ee39a102556e352" }, - "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, + "LazyVim": { "branch": "main", "commit": "dc1ffa5bcb66f46284f91a8593dda5c7c54a1824" }, + "SchemaStore.nvim": { "branch": "main", "commit": "8e17e50b519ba360bcfd5dfb5843ccac9be500ba" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, - "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, - "crates.nvim": { "branch": "main", "commit": "5d8b1bef686db0fabe5f1bb593744b617e8f1405" }, - "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" }, + "catppuccin": { "branch": "main", "commit": "c89184526212e04feffbddda9d06b041a8fca416" }, + "conform.nvim": { "branch": "master", "commit": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71" }, + "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" }, + "dial.nvim": { "branch": "master", "commit": "f0404ec1f83a03f2c3457e60087c6331d1cbb83f" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "git.nvim": { "branch": "main", "commit": "7354ed2efe31b979778cb62ffa2fa23df70eaf26" }, - "gitsigns.nvim": { "branch": "main", "commit": "1b0350ab707713b2bc6c236151f1a324175347b1" }, - "grug-far.nvim": { "branch": "main", "commit": "b3f9412b1ed76f14cfc68e1ee899873544330c80" }, - "image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" }, - "inc-rename.nvim": { "branch": "main", "commit": "a3e31af13844534c66041ce92f29af7745883875" }, + "git.nvim": { "branch": "main", "commit": "70ceb406568132aec754b25b46ebda1a05dd46f0" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, + "grug-far.nvim": { "branch": "main", "commit": "48f9afb684de1c191af7bed96bc1db85ba33f6a4" }, + "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" }, + "inc-rename.nvim": { "branch": "main", "commit": "7c79416330364976955ec8059fe3832b72ee1271" }, "incline.nvim": { "branch": "main", "commit": "0fd2d5a27504dba7fdc507a53275f22c081fe640" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.ai": { "branch": "main", "commit": "d172ada7b0281044a06cb9a625a862553c457b6f" }, - "mini.bracketed": { "branch": "main", "commit": "a54a2a180dc40f4d85875eeafacbdf991d042a36" }, - "mini.hipatterns": { "branch": "main", "commit": "d71c21167d6bd5f21c9ecf90912c510f9edfc02b" }, - "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, - "mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" }, + "mini.bracketed": { "branch": "main", "commit": "0ea3cb6478e5fdeca33b53fd08683eb2e622f6ce" }, + "mini.hipatterns": { "branch": "main", "commit": "5629d5fba132b4ab0b3f0039549308421f65ff45" }, + "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" }, + "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" }, "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" }, - "nvim-lspconfig": { "branch": "master", "commit": "2d0ca00368742c0c7af802b9b2a920c4cd02303a" }, - "nvim-notify": { "branch": "master", "commit": "a22f5d7ac511c2df2fd3290a9f04c48d5a822e2e" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-lint": { "branch": "master", "commit": "335a6044be16d7701001059cba9baa36fbeef422" }, + "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, + "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, + "nvim-treesitter": { "branch": "main", "commit": "b684696315a11e1b08564398bda778788eac92a9" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "refactoring.nvim": { "branch": "master", "commit": "9cd0186ffe76fe6abc64c0aafb775c8f776ab5ee" }, - "rustaceanvim": { "branch": "master", "commit": "2bd452c23dee06ced27abae4b562baee50158b66" }, - "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" }, + "rustaceanvim": { "branch": "master", "commit": "7c9271934d926969e920f7da932da6ba234b1e5a" }, + "snacks.nvim": { "branch": "main", "commit": "bfe8c26dbd83f7c4fbc222787552e29b4eccfcc0" }, "solarized-osaka.nvim": { "branch": "main", "commit": "f796014c14b1910e08d42cc2077fef34f08e0295" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "7bf55ed0ff5be182ad3301cff266581fc1c56cce" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "tokyonight.nvim": { "branch": "main", "commit": "4d159616aee17796c2c94d2f5f87d2ee1a3f67c7" }, + "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" }, "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, - "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } + "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" }, + "zen-mode.nvim": { "branch": "main", "commit": "dfcb72a2dfeedc5342b2ee3a68c83243d682ba3c" } } diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index f41671f..3bbffe7 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -4,8 +4,8 @@ ], "install_version": 8, "news": { - "NEWS.md": "10960", - "doc/news.txt": "24841" + "NEWS.md": "11866", + "doc/news.txt": "25358" }, "version": 8 } \ No newline at end of file diff --git a/nvim/lua/plugins/coding.lua b/nvim/lua/plugins/coding.lua index 963e401..f1133f4 100644 --- a/nvim/lua/plugins/coding.lua +++ b/nvim/lua/plugins/coding.lua @@ -41,7 +41,7 @@ return { -- Go forward/backward with square brackets { - "echasnovski/mini.bracketed", + "nvim-mini/mini.bracketed", event = "BufReadPost", config = function() local bracketed = require("mini.bracketed") diff --git a/nvim/lua/plugins/editor.lua b/nvim/lua/plugins/editor.lua index 507f52d..d8f53dd 100644 --- a/nvim/lua/plugins/editor.lua +++ b/nvim/lua/plugins/editor.lua @@ -14,7 +14,7 @@ return { }, { - "echasnovski/mini.hipatterns", + "nvim-mini/mini.hipatterns", event = "BufReadPre", opts = { highlighters = { diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 1979c45..cc76ffa 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -1,7 +1,7 @@ return { -- tools { - "williamboman/mason.nvim", + "mason-org/mason.nvim", opts = function(_, opts) vim.list_extend(opts.ensure_installed, { "stylua", diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index f3443d2..d11c9fb 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -53,7 +53,7 @@ return { }, }, config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) + require("nvim-treesitter.config").setup(opts) -- MDX vim.filetype.add({ diff --git a/nvim/nvim/init.lua b/nvim/nvim/init.lua deleted file mode 100644 index 00d56f4..0000000 --- a/nvim/nvim/init.lua +++ /dev/null @@ -1,10 +0,0 @@ -if vim.loader then - vim.loader.enable() -end - -_G.dd = function(...) - require("util.debug").dump(...) -end -vim.print = _G.dd - -require("config.lazy") diff --git a/nvim/nvim/lazy-lock.json b/nvim/nvim/lazy-lock.json deleted file mode 100644 index 3ae6d1a..0000000 --- a/nvim/nvim/lazy-lock.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "LazyVim": { "branch": "main", "commit": "dc1ffa5bcb66f46284f91a8593dda5c7c54a1824" }, - "SchemaStore.nvim": { "branch": "main", "commit": "8e17e50b519ba360bcfd5dfb5843ccac9be500ba" }, - "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, - "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "c89184526212e04feffbddda9d06b041a8fca416" }, - "conform.nvim": { "branch": "master", "commit": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71" }, - "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" }, - "dial.nvim": { "branch": "master", "commit": "f0404ec1f83a03f2c3457e60087c6331d1cbb83f" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "git.nvim": { "branch": "main", "commit": "70ceb406568132aec754b25b46ebda1a05dd46f0" }, - "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, - "grug-far.nvim": { "branch": "main", "commit": "48f9afb684de1c191af7bed96bc1db85ba33f6a4" }, - "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" }, - "inc-rename.nvim": { "branch": "main", "commit": "7c79416330364976955ec8059fe3832b72ee1271" }, - "incline.nvim": { "branch": "main", "commit": "0fd2d5a27504dba7fdc507a53275f22c081fe640" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" }, - "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, - "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" }, - "mini.bracketed": { "branch": "main", "commit": "0ea3cb6478e5fdeca33b53fd08683eb2e622f6ce" }, - "mini.hipatterns": { "branch": "main", "commit": "5629d5fba132b4ab0b3f0039549308421f65ff45" }, - "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" }, - "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" }, - "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" }, - "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lint": { "branch": "master", "commit": "335a6044be16d7701001059cba9baa36fbeef422" }, - "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, - "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-treesitter": { "branch": "main", "commit": "b684696315a11e1b08564398bda778788eac92a9" }, - "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, - "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, - "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, - "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" }, - "rustaceanvim": { "branch": "master", "commit": "7c9271934d926969e920f7da932da6ba234b1e5a" }, - "snacks.nvim": { "branch": "main", "commit": "bfe8c26dbd83f7c4fbc222787552e29b4eccfcc0" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "f796014c14b1910e08d42cc2077fef34f08e0295" }, - "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, - "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "4d159616aee17796c2c94d2f5f87d2ee1a3f67c7" }, - "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" }, - "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, - "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" }, - "zen-mode.nvim": { "branch": "main", "commit": "dfcb72a2dfeedc5342b2ee3a68c83243d682ba3c" } -} diff --git a/nvim/nvim/lazyvim.json b/nvim/nvim/lazyvim.json deleted file mode 100644 index 3bbffe7..0000000 --- a/nvim/nvim/lazyvim.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extras": [ - - ], - "install_version": 8, - "news": { - "NEWS.md": "11866", - "doc/news.txt": "25358" - }, - "version": 8 -} \ No newline at end of file diff --git a/nvim/nvim/lua/config/autocmds.lua b/nvim/nvim/lua/config/autocmds.lua deleted file mode 100644 index a9d3f98..0000000 --- a/nvim/nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,14 +0,0 @@ --- Turn off paste mode when leaving insert -vim.api.nvim_create_autocmd("InsertLeave", { - pattern = "*", - command = "set nopaste", -}) - --- Disable the concealing in some file formats --- The default conceallevel is 3 in LazyVim -vim.api.nvim_create_autocmd("FileType", { - pattern = { "json", "jsonc", "markdown" }, - callback = function() - vim.opt.conceallevel = 0 - end, -}) diff --git a/nvim/nvim/lua/config/keymaps.lua b/nvim/nvim/lua/config/keymaps.lua deleted file mode 100644 index eb1e725..0000000 --- a/nvim/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,74 +0,0 @@ -local discipline = require("m1ngsama.discipline") - --- discipline.cowboy() - -local keymap = vim.keymap -local opts = { noremap = true, silent = true } - --- Do things without affecting the registers -keymap.set("n", "x", '"_x') -keymap.set("n", "p", '"0p') -keymap.set("n", "P", '"0P') -keymap.set("v", "p", '"0p') -keymap.set("n", "c", '"_c') -keymap.set("n", "C", '"_C') -keymap.set("v", "c", '"_c') -keymap.set("v", "C", '"_C') -keymap.set("n", "d", '"_d') -keymap.set("n", "D", '"_D') -keymap.set("v", "d", '"_d') -keymap.set("v", "D", '"_D') - --- Increment/decrement -keymap.set("n", "+", "") -keymap.set("n", "-", "") - --- Delete a word backwards -keymap.set("n", "dw", 'vb"_d') - --- Select all -keymap.set("n", "", "ggG") - --- Save with root permission (not working for now) ---vim.api.nvim_create_user_command('W', 'w !sudo tee > /dev/null %', {}) - --- Disable continuations -keymap.set("n", "o", "o^Da", opts) -keymap.set("n", "O", "O^Da", opts) - --- Jumplist -keymap.set("n", "", "", opts) - --- New tab -keymap.set("n", "te", ":tabedit") -keymap.set("n", "", ":tabnext", opts) -keymap.set("n", "", ":tabprev", opts) --- Split window -keymap.set("n", "ss", ":split", opts) -keymap.set("n", "sv", ":vsplit", opts) --- Move window -keymap.set("n", "sh", "h") -keymap.set("n", "sk", "k") -keymap.set("n", "sj", "j") -keymap.set("n", "sl", "l") - --- Resize window -keymap.set("n", "", "<") -keymap.set("n", "", ">") -keymap.set("n", "", "+") -keymap.set("n", "", "-") - --- Diagnostics -keymap.set("n", "", function() - vim.diagnostic.goto_next() -end, opts) - -keymap.set("n", "mp", "MarkdownPreview", { desc = "Markdown Preview" }) - -keymap.set("n", "r", function() - require("m1ngsama.hsl").replaceHexWithHSL() -end) - -keymap.set("n", "i", function() - require("m1ngsama.lsp").toggleInlayHints() -end) diff --git a/nvim/nvim/lua/config/lazy.lua b/nvim/nvim/lua/config/lazy.lua deleted file mode 100644 index 014aa3b..0000000 --- a/nvim/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,87 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { - "LazyVim/LazyVim", - import = "lazyvim.plugins", - opts = { - colorscheme = "solarized-osaka", - news = { - lazyvim = true, - neovim = true, - }, - }, - }, - -- import any extras modules here - { import = "lazyvim.plugins.extras.linting.eslint" }, - { import = "lazyvim.plugins.extras.formatting.prettier" }, - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.json" }, - -- { import = "lazyvim.plugins.extras.lang.markdown" }, - { import = "lazyvim.plugins.extras.lang.rust" }, - { import = "lazyvim.plugins.extras.lang.tailwind" }, - -- { import = "lazyvim.plugins.extras.ai.copilot" }, - -- { import = "lazyvim.plugins.extras.dap.core" }, - -- { import = "lazyvim.plugins.extras.vscode" }, - { import = "lazyvim.plugins.extras.util.mini-hipatterns" }, - -- { import = "lazyvim.plugins.extras.test.core" }, - -- { import = "lazyvim.plugins.extras.coding.yanky" }, - -- { import = "lazyvim.plugins.extras.editor.mini-files" }, - -- { import = "lazyvim.plugins.extras.util.project" }, - { import = "plugins" }, - }, - defaults = { - -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. - -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. - lazy = false, - -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, - -- have outdated releases, which may break your Neovim install. - version = false, -- always use the latest git commit - -- version = "*", -- try installing the latest stable version for plugins that support semver - }, - dev = { - path = "~/.ghq/github.com", - }, - checker = { enabled = true }, -- automatically check for plugin updates - performance = { - cache = { - enabled = true, - -- disable_events = {}, - }, - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", - -- "matchit", - -- "matchparen", - "netrwPlugin", - "rplugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, - ui = { - custom_keys = { - ["d"] = function(plugin) - dd(plugin) - end, - }, - }, - debug = false, -}) diff --git a/nvim/nvim/lua/config/options.lua b/nvim/nvim/lua/config/options.lua deleted file mode 100644 index 218f64d..0000000 --- a/nvim/nvim/lua/config/options.lua +++ /dev/null @@ -1,47 +0,0 @@ -vim.g.mapleader = " " - -vim.opt.encoding = "utf-8" -vim.opt.fileencoding = "utf-8" - -vim.opt.number = true - -vim.opt.title = true -vim.opt.autoindent = true -vim.opt.smartindent = true -vim.opt.hlsearch = true -vim.opt.backup = false -vim.opt.showcmd = true -vim.opt.cmdheight = 1 -vim.opt.laststatus = 3 -vim.opt.expandtab = true -vim.opt.scrolloff = 10 -vim.opt.shell = "fish" -vim.opt.backupskip = { "/tmp/*", "/private/tmp/*" } -vim.opt.inccommand = "split" -vim.opt.ignorecase = true -- Case insensitive searching UNLESS /C or capital in search -vim.opt.smarttab = true -vim.opt.breakindent = true -vim.opt.shiftwidth = 2 -vim.opt.tabstop = 2 -vim.opt.wrap = false -- No Wrap lines -vim.opt.backspace = { "start", "eol", "indent" } -vim.opt.path:append({ "**" }) -- Finding files - Search down into subfolders -vim.opt.wildignore:append({ "*/node_modules/*" }) -vim.opt.splitbelow = true -- Put new windows below current -vim.opt.splitright = true -- Put new windows right of current -vim.opt.splitkeep = "cursor" -vim.opt.mouse = "" - --- Undercurl -vim.cmd([[let &t_Cs = "\e[4:3m"]]) -vim.cmd([[let &t_Ce = "\e[4:0m"]]) - --- Add asterisks in block comments -vim.opt.formatoptions:append({ "r" }) - -vim.cmd([[au BufNewFile,BufRead *.astro setf astro]]) -vim.cmd([[au BufNewFile,BufRead Podfile setf ruby]]) - -if vim.fn.has("nvim-0.8") == 1 then - vim.opt.cmdheight = 0 -end diff --git a/nvim/nvim/lua/m1ngsama/discipline.lua b/nvim/nvim/lua/m1ngsama/discipline.lua deleted file mode 100644 index ff2c0d5..0000000 --- a/nvim/nvim/lua/m1ngsama/discipline.lua +++ /dev/null @@ -1,36 +0,0 @@ -local M = {} - -function M.cowboy() - ---@type table? - local ok = true - for _, key in ipairs({ "h", "j", "k", "l", "+", "-" }) do - local count = 0 - local timer = assert(vim.uv.new_timer()) - local map = key - vim.keymap.set("n", key, function() - if vim.v.count > 0 then - count = 0 - end - if count >= 10 and vim.bo.buftype ~= "nofile" then - ok = pcall(vim.notify, "Hold it Cowboy!", vim.log.levels.WARN, { - icon = "🤠", - id = "cowboy", - keep = function() - return count >= 10 - end, - }) - if not ok then - return map - end - else - count = count + 1 - timer:start(2000, 0, function() - count = 0 - end) - return map - end - end, { expr = true, silent = true }) - end -end - -return M diff --git a/nvim/nvim/lua/m1ngsama/hsl.lua b/nvim/nvim/lua/m1ngsama/hsl.lua deleted file mode 100644 index 4c97404..0000000 --- a/nvim/nvim/lua/m1ngsama/hsl.lua +++ /dev/null @@ -1,154 +0,0 @@ --- https://github.com/EmmanuelOga/columns/blob/master/utils/color.lua - -local M = {} - -local hexChars = "0123456789abcdef" - -function M.hex_to_rgb(hex) - hex = string.lower(hex) - local ret = {} - for i = 0, 2 do - local char1 = string.sub(hex, i * 2 + 2, i * 2 + 2) - local char2 = string.sub(hex, i * 2 + 3, i * 2 + 3) - local digit1 = string.find(hexChars, char1) - 1 - local digit2 = string.find(hexChars, char2) - 1 - ret[i + 1] = (digit1 * 16 + digit2) / 255.0 - end - return ret -end - ---[[ - * Converts an RGB color value to HSL. Conversion formula - * adapted from http://en.wikipedia.org/wiki/HSL_color_space. - * Assumes r, g, and b are contained in the set [0, 255] and - * returns h, s, and l in the set [0, 1]. - * - * @param Number r The red color value - * @param Number g The green color value - * @param Number b The blue color value - * @return Array The HSL representation -]] -function M.rgbToHsl(r, g, b) - local max, min = math.max(r, g, b), math.min(r, g, b) - local h = 0 - local s = 0 - local l = 0 - - l = (max + min) / 2 - - if max == min then - h, s = 0, 0 -- achromatic - else - local d = max - min - if l > 0.5 then - s = d / (2 - max - min) - else - s = d / (max + min) - end - if max == r then - h = (g - b) / d - if g < b then - h = h + 6 - end - elseif max == g then - h = (b - r) / d + 2 - elseif max == b then - h = (r - g) / d + 4 - end - h = h / 6 - end - - return h * 360, s * 100, l * 100 -end - ---[[ - * Converts an HSL color value to RGB. Conversion formula - * adapted from http://en.wikipedia.org/wiki/HSL_color_space. - * Assumes h, s, and l are contained in the set [0, 1] and - * returns r, g, and b in the set [0, 255]. - * - * @param Number h The hue - * @param Number s The saturation - * @param Number l The lightness - * @return Array The RGB representation -]] -function M.hslToRgb(h, s, l) - local r, g, b - - if s == 0 then - r, g, b = l, l, l -- achromatic - else - function hue2rgb(p, q, t) - if t < 0 then - t = t + 1 - end - if t > 1 then - t = t - 1 - end - if t < 1 / 6 then - return p + (q - p) * 6 * t - end - if t < 1 / 2 then - return q - end - if t < 2 / 3 then - return p + (q - p) * (2 / 3 - t) * 6 - end - return p - end - - local q - if l < 0.5 then - q = l * (1 + s) - else - q = l + s - l * s - end - local p = 2 * l - q - - r = hue2rgb(p, q, h + 1 / 3) - g = hue2rgb(p, q, h) - b = hue2rgb(p, q, h - 1 / 3) - end - - return r * 255, g * 255, b * 255 -end - -function M.hexToHSL(hex) - local hsluv = require("solarized-osaka.hsluv") - local rgb = M.hex_to_rgb(hex) - local h, s, l = M.rgbToHsl(rgb[1], rgb[2], rgb[3]) - - return string.format("hsl(%d, %d, %d)", math.floor(h + 0.5), math.floor(s + 0.5), math.floor(l + 0.5)) -end - ---[[ - * Converts an HSL color value to RGB in Hex representation. - * @param Number h The hue - * @param Number s The saturation - * @param Number l The lightness - * @return String The hex representation -]] -function M.hslToHex(h, s, l) - local r, g, b = M.hslToRgb(h / 360, s / 100, l / 100) - - return string.format("#%02x%02x%02x", r, g, b) -end - -function M.replaceHexWithHSL() - -- Get the current line number - local line_number = vim.api.nvim_win_get_cursor(0)[1] - - -- Get the line content - local line_content = vim.api.nvim_buf_get_lines(0, line_number - 1, line_number, false)[1] - - -- Find hex code patterns and replace them - for hex in line_content:gmatch("#[0-9a-fA-F]+") do - local hsl = M.hexToHSL(hex) - line_content = line_content:gsub(hex, hsl) - end - - -- Set the line content back - vim.api.nvim_buf_set_lines(0, line_number - 1, line_number, false, { line_content }) -end - -return M diff --git a/nvim/nvim/lua/m1ngsama/lsp.lua b/nvim/nvim/lua/m1ngsama/lsp.lua deleted file mode 100644 index a52e945..0000000 --- a/nvim/nvim/lua/m1ngsama/lsp.lua +++ /dev/null @@ -1,7 +0,0 @@ -local M = {} - -function M.toggleInlayHints() - vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) -end - -return M diff --git a/nvim/nvim/lua/plugins/coding.lua b/nvim/nvim/lua/plugins/coding.lua deleted file mode 100644 index f1133f4..0000000 --- a/nvim/nvim/lua/plugins/coding.lua +++ /dev/null @@ -1,97 +0,0 @@ -return { - -- Create annotations with one keybind, and jump your cursor in the inserted annotation - { - "danymat/neogen", - keys = { - { - "cc", - function() - require("neogen").generate({}) - end, - desc = "Neogen Comment", - }, - }, - opts = { snippet_engine = "luasnip" }, - }, - - -- Incremental rename - { - "smjonas/inc-rename.nvim", - cmd = "IncRename", - config = true, - }, - - -- Refactoring tool - { - "ThePrimeagen/refactoring.nvim", - keys = { - { - "r", - function() - require("refactoring").select_refactor() - end, - mode = "v", - noremap = true, - silent = true, - expr = false, - }, - }, - opts = {}, - }, - - -- Go forward/backward with square brackets - { - "nvim-mini/mini.bracketed", - event = "BufReadPost", - config = function() - local bracketed = require("mini.bracketed") - bracketed.setup({ - file = { suffix = "" }, - window = { suffix = "" }, - quickfix = { suffix = "" }, - yank = { suffix = "" }, - treesitter = { suffix = "n" }, - }) - end, - }, - - -- Better increase/descrease - { - "monaqa/dial.nvim", - -- stylua: ignore - keys = { - { "", function() return require("dial.map").inc_normal() end, expr = true, desc = "Increment" }, - { "", function() return require("dial.map").dec_normal() end, expr = true, desc = "Decrement" }, - }, - config = function() - local augend = require("dial.augend") - require("dial.config").augends:register_group({ - default = { - augend.integer.alias.decimal, - augend.integer.alias.hex, - augend.date.alias["%Y/%m/%d"], - augend.constant.alias.bool, - augend.semver.alias.semver, - augend.constant.new({ elements = { "let", "const" } }), - }, - }) - end, - }, - - { - "simrat39/symbols-outline.nvim", - keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, - cmd = "SymbolsOutline", - opts = { - position = "right", - }, - }, - - { - "nvim-cmp", - dependencies = { "hrsh7th/cmp-emoji" }, - opts = function(_, opts) - table.insert(opts.sources, { name = "emoji" }) - end, - }, -} diff --git a/nvim/nvim/lua/plugins/colorscheme.lua b/nvim/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index b126b70..0000000 --- a/nvim/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - "craftzdog/solarized-osaka.nvim", - lazy = true, - priority = 1000, - opts = function() - return { - transparent = true, - } - end, - }, -} diff --git a/nvim/nvim/lua/plugins/editor.lua b/nvim/nvim/lua/plugins/editor.lua deleted file mode 100644 index d8f53dd..0000000 --- a/nvim/nvim/lua/plugins/editor.lua +++ /dev/null @@ -1,237 +0,0 @@ -return { - { - enabled = false, - "folke/flash.nvim", - ---@type Flash.Config - opts = { - search = { - forward = true, - multi_window = false, - wrap = false, - incremental = true, - }, - }, - }, - - { - "nvim-mini/mini.hipatterns", - event = "BufReadPre", - opts = { - highlighters = { - hsl_color = { - pattern = "hsl%(%d+,? %d+%%?,? %d+%%?%)", - group = function(_, match) - local utils = require("solarized-osaka.hsl") - --- @type string, string, string - local nh, ns, nl = match:match("hsl%((%d+),? (%d+)%%?,? (%d+)%%?%)") - --- @type number?, number?, number? - local h, s, l = tonumber(nh), tonumber(ns), tonumber(nl) - --- @type string - local hex_color = utils.hslToHex(h, s, l) - return MiniHipatterns.compute_hex_color_group(hex_color, "bg") - end, - }, - }, - }, - }, - - { - "dinhhuy258/git.nvim", - event = "BufReadPre", - opts = { - keymaps = { - -- Open blame window - blame = "gb", - -- Open file/folder in git repository - browse = "go", - }, - }, - }, - - { - "nvim-telescope/telescope.nvim", - dependencies = { - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - }, - "nvim-telescope/telescope-file-browser.nvim", - }, - keys = { - { - "fP", - function() - require("telescope.builtin").find_files({ - cwd = require("lazy.core.config").options.root, - }) - end, - desc = "Find Plugin File", - }, - { - ";f", - function() - local builtin = require("telescope.builtin") - builtin.find_files({ - no_ignore = false, - hidden = true, - }) - end, - desc = "Lists files in your current working directory, respects .gitignore", - }, - { - ";r", - function() - local builtin = require("telescope.builtin") - builtin.live_grep({ - additional_args = { "--hidden" }, - }) - end, - desc = "Search for a string in your current working directory and get results live as you type, respects .gitignore", - }, - { - "\\\\", - function() - local builtin = require("telescope.builtin") - builtin.buffers() - end, - desc = "Lists open buffers", - }, - { - ";t", - function() - local builtin = require("telescope.builtin") - builtin.help_tags() - end, - desc = "Lists available help tags and opens a new window with the relevant help info on ", - }, - { - ";;", - function() - local builtin = require("telescope.builtin") - builtin.resume() - end, - desc = "Resume the previous telescope picker", - }, - { - ";e", - function() - local builtin = require("telescope.builtin") - builtin.diagnostics() - end, - desc = "Lists Diagnostics for all open buffers or a specific buffer", - }, - { - ";s", - function() - local builtin = require("telescope.builtin") - builtin.treesitter() - end, - desc = "Lists Function names, variables, from Treesitter", - }, - { - "sf", - function() - local telescope = require("telescope") - - local function telescope_buffer_dir() - return vim.fn.expand("%:p:h") - end - - telescope.extensions.file_browser.file_browser({ - path = "%:p:h", - cwd = telescope_buffer_dir(), - respect_gitignore = false, - hidden = true, - grouped = true, - previewer = false, - initial_mode = "normal", - layout_config = { height = 40 }, - }) - end, - desc = "Open File Browser with the path of the current buffer", - }, - }, - config = function(_, opts) - local telescope = require("telescope") - local actions = require("telescope.actions") - local fb_actions = require("telescope").extensions.file_browser.actions - - opts.defaults = vim.tbl_deep_extend("force", opts.defaults, { - wrap_results = true, - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - mappings = { - n = {}, - }, - }) - opts.pickers = { - diagnostics = { - theme = "ivy", - initial_mode = "normal", - layout_config = { - preview_cutoff = 9999, - }, - }, - } - opts.extensions = { - file_browser = { - theme = "dropdown", - -- disables netrw and use telescope-file-browser in its place - hijack_netrw = true, - mappings = { - -- your custom insert mode mappings - ["n"] = { - -- your custom normal mode mappings - ["N"] = fb_actions.create, - ["h"] = fb_actions.goto_parent_dir, - ["/"] = function() - vim.cmd("startinsert") - end, - [""] = function(prompt_bufnr) - for i = 1, 10 do - actions.move_selection_previous(prompt_bufnr) - end - end, - [""] = function(prompt_bufnr) - for i = 1, 10 do - actions.move_selection_next(prompt_bufnr) - end - end, - [""] = actions.preview_scrolling_up, - [""] = actions.preview_scrolling_down, - }, - }, - }, - } - telescope.setup(opts) - require("telescope").load_extension("fzf") - require("telescope").load_extension("file_browser") - end, - }, - - { - "saghen/blink.cmp", - opts = { - completion = { - menu = { - winblend = vim.o.pumblend, - }, - }, - signature = { - window = { - winblend = vim.o.pumblend, - }, - }, - }, - }, - - { - "3rd/image.nvim", - build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239 - opts = { - processor = "magick_cli", - }, - }, -} diff --git a/nvim/nvim/lua/plugins/lsp.lua b/nvim/nvim/lua/plugins/lsp.lua deleted file mode 100644 index cc76ffa..0000000 --- a/nvim/nvim/lua/plugins/lsp.lua +++ /dev/null @@ -1,193 +0,0 @@ -return { - -- tools - { - "mason-org/mason.nvim", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "stylua", - "selene", - "luacheck", - "shellcheck", - "shfmt", - "tailwindcss-language-server", - "typescript-language-server", - "css-lsp", - "clangd", - }) - end, - }, - - -- lsp servers - { - "neovim/nvim-lspconfig", - opts = { - inlay_hints = { enabled = false }, - ---@type lspconfig.options - servers = { - cssls = {}, - tailwindcss = { - root_dir = function(...) - return require("lspconfig.util").root_pattern(".git")(...) - end, - }, - tsserver = { - root_dir = function(...) - return require("lspconfig.util").root_pattern(".git")(...) - end, - single_file_support = false, - settings = { - typescript = { - inlayHints = { - includeInlayParameterNameHints = "literal", - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = false, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, - }, - javascript = { - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, - }, - }, - }, - html = {}, - yamlls = { - settings = { - yaml = { - keyOrdering = false, - }, - }, - }, - lua_ls = { - -- enabled = false, - single_file_support = true, - settings = { - Lua = { - workspace = { - checkThirdParty = false, - }, - completion = { - workspaceWord = true, - callSnippet = "Both", - }, - misc = { - parameters = { - -- "--log-level=trace", - }, - }, - hint = { - enable = true, - setType = false, - paramType = true, - paramName = "Disable", - semicolon = "Disable", - arrayIndex = "Disable", - }, - doc = { - privateName = { "^_" }, - }, - type = { - castNumberToInteger = true, - }, - diagnostics = { - disable = { "incomplete-signature-doc", "trailing-space" }, - -- enable = false, - groupSeverity = { - strong = "Warning", - strict = "Warning", - }, - groupFileStatus = { - ["ambiguity"] = "Opened", - ["await"] = "Opened", - ["codestyle"] = "None", - ["duplicate"] = "Opened", - ["global"] = "Opened", - ["luadoc"] = "Opened", - ["redefined"] = "Opened", - ["strict"] = "Opened", - ["strong"] = "Opened", - ["type-check"] = "Opened", - ["unbalanced"] = "Opened", - ["unused"] = "Opened", - }, - unusedLocalExclude = { "_*" }, - }, - format = { - enable = false, - defaultConfig = { - indent_style = "space", - indent_size = "2", - continuation_indent_size = "2", - }, - }, - }, - }, - }, - gopls = { - settings = { - gopls = { - analyses = { - unusedparams = true, - shadow = true, - }, - staticcheck = true, - }, - }, - }, - clangd = { - cmd = { "clangd", "--background-index" }, - filetypes = { "c", "cpp", "objc", "objcpp" }, - root_dir = function(...) - return require("lspconfig.util").root_pattern( - "compile_commands.json", - "compile_flags.txt", - ".git" - )(...) - end, - }, - }, - setup = {}, - }, - }, - { - "neovim/nvim-lspconfig", - opts = function() - local keys = require("lazyvim.plugins.lsp.keymaps").get() - vim.list_extend(keys, { - { - "gd", - function() - -- DO NOT RESUSE WINDOW - require("telescope.builtin").lsp_definitions({ reuse_win = false }) - end, - desc = "Goto Definition", - has = "definition", - }, - }) - end, - }, - { - "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - ft = { "markdown" }, - build = function() - vim.fn["mkdp#util#install"]() - end, - config = function() - vim.g.mkdp_auto_start = 0 - vim.g.mkdp_auto_close = 1 - vim.g.mkdp_refresh_slow = 0 - vim.g.mkdp_command_for_global = 0 - end, - }, -} diff --git a/nvim/nvim/lua/plugins/treesitter.lua b/nvim/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index d11c9fb..0000000 --- a/nvim/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,67 +0,0 @@ -return { - { "nvim-treesitter/playground", cmd = "TSPlaygroundToggle" }, - - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "astro", - "cmake", - "cpp", - "css", - "fish", - "gitignore", - "go", - "graphql", - "http", - "java", - "php", - "rust", - "scss", - "sql", - "svelte", - }, - - -- matchup = { - -- enable = true, - -- }, - - -- https://github.com/nvim-treesitter/playground#query-linter - query_linter = { - enable = true, - use_virtual_text = true, - lint_events = { "BufWrite", "CursorHold" }, - }, - - playground = { - enable = true, - disable = {}, - updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code - persist_queries = true, -- Whether the query persists across vim sessions - keybindings = { - toggle_query_editor = "o", - toggle_hl_groups = "i", - toggle_injected_languages = "t", - toggle_anonymous_nodes = "a", - toggle_language_display = "I", - focus_language = "f", - unfocus_language = "F", - update = "R", - goto_node = "", - show_help = "?", - }, - }, - }, - config = function(_, opts) - require("nvim-treesitter.config").setup(opts) - - -- MDX - vim.filetype.add({ - extension = { - mdx = "mdx", - }, - }) - vim.treesitter.language.register("markdown", "mdx") - end, - }, -} diff --git a/nvim/nvim/lua/plugins/ui.lua b/nvim/nvim/lua/plugins/ui.lua deleted file mode 100644 index 692fd8f..0000000 --- a/nvim/nvim/lua/plugins/ui.lua +++ /dev/null @@ -1,170 +0,0 @@ -return { - -- messages, cmdline and the popupmenu - { - "folke/noice.nvim", - opts = function(_, opts) - table.insert(opts.routes, { - filter = { - event = "notify", - find = "No information available", - }, - opts = { skip = true }, - }) - local focused = true - vim.api.nvim_create_autocmd("FocusGained", { - callback = function() - focused = true - end, - }) - vim.api.nvim_create_autocmd("FocusLost", { - callback = function() - focused = false - end, - }) - table.insert(opts.routes, 1, { - filter = { - cond = function() - return not focused - end, - }, - view = "notify_send", - opts = { stop = false }, - }) - - opts.commands = { - all = { - -- options for the message history that you get with `:Noice` - view = "split", - opts = { enter = true, format = "details" }, - filter = {}, - }, - } - - vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function(event) - vim.schedule(function() - require("noice.text.markdown").keys(event.buf) - end) - end, - }) - - opts.presets.lsp_doc_border = true - end, - }, - - { - "rcarriga/nvim-notify", - opts = { - timeout = 5000, - }, - }, - - { - "snacks.nvim", - opts = { - scroll = { enabled = false }, - }, - keys = {}, - }, - - -- buffer line - { - "akinsho/bufferline.nvim", - event = "VeryLazy", - keys = { - { "", "BufferLineCycleNext", desc = "Next tab" }, - { "", "BufferLineCyclePrev", desc = "Prev tab" }, - }, - opts = { - options = { - mode = "tabs", - -- separator_style = "slant", - show_buffer_close_icons = false, - show_close_icon = false, - }, - }, - }, - - -- filename - { - "b0o/incline.nvim", - dependencies = { "craftzdog/solarized-osaka.nvim" }, - event = "BufReadPre", - priority = 1200, - config = function() - local colors = require("solarized-osaka.colors").setup() - require("incline").setup({ - highlight = { - groups = { - InclineNormal = { guibg = colors.magenta500, guifg = colors.base04 }, - InclineNormalNC = { guifg = colors.violet500, guibg = colors.base03 }, - }, - }, - window = { margin = { vertical = 0, horizontal = 1 } }, - hide = { - cursorline = true, - }, - render = function(props) - local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t") - if vim.bo[props.buf].modified then - filename = "[+] " .. filename - end - - local icon, color = require("nvim-web-devicons").get_icon_color(filename) - return { { icon, guifg = color }, { " " }, { filename } } - end, - }) - end, - }, - - -- statusline - { - "nvim-lualine/lualine.nvim", - opts = function(_, opts) - local LazyVim = require("lazyvim.util") - opts.sections.lualine_c[4] = { - LazyVim.lualine.pretty_path({ - length = 0, - relative = "cwd", - modified_hl = "MatchParen", - directory_hl = "", - filename_hl = "Bold", - modified_sign = "", - readonly_icon = " 󰌾 ", - }), - } - end, - }, - - { - "folke/zen-mode.nvim", - cmd = "ZenMode", - opts = { - plugins = { - gitsigns = true, - tmux = true, - kitty = { enabled = false, font = "+2" }, - }, - }, - keys = { { "z", "ZenMode", desc = "Zen Mode" } }, - }, - - { - "folke/snacks.nvim", - opts = { - dashboard = { - preset = { - header = [[ - ██████╗ ███████╗██╗ ██╗ █████╗ ███████╗██╗ ██╗███████╗███████╗ - ██╔══██╗██╔════╝██║ ██║██╔══██╗██╔════╝██║ ██║██╔════╝██╔════╝ - ██║ ██║█████╗ ██║ ██║███████║███████╗██║ ██║█████╗ █████╗ - ██║ ██║██╔══╝ ╚██╗ ██╔╝██╔══██║╚════██║██║ ██║██╔══╝ ██╔══╝ - ██████╔╝███████╗ ╚████╔╝ ██║ ██║███████║███████╗██║██║ ███████╗ - ╚═════╝ ╚══════╝ ╚═══╝ ╚═╝ ╚═╝╚══════╝╚══════╝╚═╝╚═╝ ╚══════╝ - ]], - }, - }, - }, - }, -} diff --git a/nvim/nvim/lua/util/debug.lua b/nvim/nvim/lua/util/debug.lua deleted file mode 100644 index 136823f..0000000 --- a/nvim/nvim/lua/util/debug.lua +++ /dev/null @@ -1,158 +0,0 @@ --- selene: allow(global_usage) - -local M = {} - -function M.get_loc() - local me = debug.getinfo(1, "S") - local level = 2 - local info = debug.getinfo(level, "S") - while info and (info.source == me.source or info.source == "@" .. vim.env.MYVIMRC or info.what ~= "Lua") do - level = level + 1 - info = debug.getinfo(level, "S") - end - info = info or me - local source = info.source:sub(2) - source = vim.loop.fs_realpath(source) or source - return source .. ":" .. info.linedefined -end - ----@param value any ----@param opts? {loc:string} -function M._dump(value, opts) - opts = opts or {} - opts.loc = opts.loc or M.get_loc() - if vim.in_fast_event() then - return vim.schedule(function() - M._dump(value, opts) - end) - end - opts.loc = vim.fn.fnamemodify(opts.loc, ":~:.") - local msg = vim.inspect(value) - vim.notify(msg, vim.log.levels.INFO, { - title = "Debug: " .. opts.loc, - on_open = function(win) - vim.wo[win].conceallevel = 3 - vim.wo[win].concealcursor = "" - vim.wo[win].spell = false - local buf = vim.api.nvim_win_get_buf(win) - if not pcall(vim.treesitter.start, buf, "lua") then - vim.bo[buf].filetype = "lua" - end - end, - }) -end - -function M.dump(...) - local value = { ... } - if vim.tbl_isempty(value) then - value = nil - else - value = vim.tbl_islist(value) and vim.tbl_count(value) <= 1 and value[1] or value - end - M._dump(value) -end - -function M.extmark_leaks() - local nsn = vim.api.nvim_get_namespaces() - - local counts = {} - - for name, ns in pairs(nsn) do - for _, buf in ipairs(vim.api.nvim_list_bufs()) do - local count = #vim.api.nvim_buf_get_extmarks(buf, ns, 0, -1, {}) - if count > 0 then - counts[#counts + 1] = { - name = name, - buf = buf, - count = count, - ft = vim.bo[buf].ft, - } - end - end - end - table.sort(counts, function(a, b) - return a.count > b.count - end) - dd(counts) -end - -function estimateSize(value, visited) - if value == nil then - return 0 - end - local bytes = 0 - - -- initialize the visited table if not already done - --- @type table - visited = visited or {} - - -- handle already-visited value to avoid infinite recursion - if visited[value] then - return 0 - else - visited[value] = true - end - - if type(value) == "boolean" or value == nil then - bytes = 4 - elseif type(value) == "number" then - bytes = 8 - elseif type(value) == "string" then - bytes = string.len(value) + 24 - elseif type(value) == "function" then - bytes = 32 -- base size for a function - -- add size of upvalues - local i = 1 - while true do - local name, val = debug.getupvalue(value, i) - if not name then - break - end - bytes = bytes + estimateSize(val, visited) - i = i + 1 - end - elseif type(value) == "table" then - bytes = 40 -- base size for a table entry - for k, v in pairs(value) do - bytes = bytes + estimateSize(k, visited) + estimateSize(v, visited) - end - local mt = debug.getmetatable(value) - if mt then - bytes = bytes + estimateSize(mt, visited) - end - end - return bytes -end - -function M.module_leaks(filter) - local sizes = {} - for modname, mod in pairs(package.loaded) do - if not filter or modname:match(filter) then - local root = modname:match("^([^%.]+)%..*$") or modname - -- root = modname - sizes[root] = sizes[root] or { mod = root, size = 0 } - sizes[root].size = sizes[root].size + estimateSize(mod) / 1024 / 1024 - end - end - sizes = vim.tbl_values(sizes) - table.sort(sizes, function(a, b) - return a.size > b.size - end) - dd(sizes) -end - -function M.get_upvalue(func, name) - local i = 1 - while true do - local n, v = debug.getupvalue(func, i) - if not n then - break - end - if n == name then - return v - end - i = i + 1 - end -end - -return M