From 9c1281ef4ff808079bd7ea6afc9be75b0ece2763 Mon Sep 17 00:00:00 2001 From: Dario48true Date: Wed, 26 Feb 2025 11:03:07 +0100 Subject: [PATCH] tmp --- init.lua | 4 ++++ lazy-lock.json | 27 +++++++++++++++++++++++ lua/config/autocmd.lua | 6 ++++++ lua/config/general.lua | 7 ++++++ lua/plugins/conformer.lua | 12 +++++++++++ lua/plugins/image.lua | 4 ++++ lua/plugins/rainbow_parentheses.lua | 33 +++++++++++++++++++++++++++++ 7 files changed, 93 insertions(+) create mode 100644 lua/config/autocmd.lua create mode 100644 lua/plugins/conformer.lua create mode 100644 lua/plugins/image.lua create mode 100644 lua/plugins/rainbow_parentheses.lua diff --git a/init.lua b/init.lua index de67cb0..0a2e79f 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,7 @@ require("config.lazy") require("config.general") +<<<<<<< HEAD +======= +require("config.autocmd") +>>>>>>> c43d072 (tmp) diff --git a/lazy-lock.json b/lazy-lock.json index 74d72e0..3941f29 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -25,4 +26,30 @@ "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, "vim-jukit": { "branch": "master", "commit": "73214c9a8abc4b6aa7a6266b5bc2ddbf8b3e3c00" }, "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" } +======= + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" }, + "image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "neorg": { "branch": "main", "commit": "09d467eaf2f68c1e0c43161b14587a2f4467ef4c" }, + "neorg-extras": { "branch": "main", "commit": "277035808dabb5f8fbb64090d2212940115929d9" }, + "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim-cmp": { "branch": "main", "commit": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3" }, + "nvim-lspconfig": { "branch": "master", "commit": "99c75820f2606b6b446cad7c75ec2ef7ee8a1317" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-treesitter": { "branch": "master", "commit": "93ce9feb4fabbb37b3e7f47d80f27be778f4d956" }, + "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "011d98eaa3a73b5a51d82ce5bc6b1397dde95562" }, + "telescope.nvim": { "branch": "master", "commit": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4" }, + "vim-jukit": { "branch": "master", "commit": "73214c9a8abc4b6aa7a6266b5bc2ddbf8b3e3c00" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +>>>>>>> c43d072 (tmp) } diff --git a/lua/config/autocmd.lua b/lua/config/autocmd.lua new file mode 100644 index 0000000..77e01ac --- /dev/null +++ b/lua/config/autocmd.lua @@ -0,0 +1,6 @@ +vim.api.nvim_create_autocmd("BufWritePre", { + pattern = "*", + callback = function(args) + require("conform").format({ bufnr = args.buf }) + end, +}) diff --git a/lua/config/general.lua b/lua/config/general.lua index bcdc1d6..086ea99 100644 --- a/lua/config/general.lua +++ b/lua/config/general.lua @@ -10,6 +10,13 @@ vim.opt.nu = true vim.cmd([[set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<,space:•]]) vim.keymap.set("n", "hc", ":set list!", { silent = true }) +<<<<<<< HEAD +======= +vim.keymap.set("n", ".", ":", {}) + +vim.keymap.set("i", "jk", "", {}) + +>>>>>>> c43d072 (tmp) vim.opt.termguicolors = true vim.opt.hlsearch = false diff --git a/lua/plugins/conformer.lua b/lua/plugins/conformer.lua new file mode 100644 index 0000000..1a0e2c5 --- /dev/null +++ b/lua/plugins/conformer.lua @@ -0,0 +1,12 @@ +return { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + lua = { "stylua" }, + js = { "prettierd" }, + html = { "prettierd" }, + c = { "clang-format" }, + cpp = { "clang-format" }, + }, + }, +} diff --git a/lua/plugins/image.lua b/lua/plugins/image.lua new file mode 100644 index 0000000..37c5a39 --- /dev/null +++ b/lua/plugins/image.lua @@ -0,0 +1,4 @@ +return { + "3rd/image.nvim", + opts = {}, +} diff --git a/lua/plugins/rainbow_parentheses.lua b/lua/plugins/rainbow_parentheses.lua new file mode 100644 index 0000000..60505ff --- /dev/null +++ b/lua/plugins/rainbow_parentheses.lua @@ -0,0 +1,33 @@ +return { + "HiPhish/rainbow-delimiters.nvim", + lazy = false, + init = function() + -- This module contains a number of default definitions + local rainbow_delimiters = require("rainbow-delimiters") + + ---@type rainbow_delimiters.config + vim.g.rainbow_delimiters = { + strategy = { + [""] = rainbow_delimiters.strategy["global"], + vim = rainbow_delimiters.strategy["local"], + }, + query = { + [""] = "rainbow-delimiters", + lua = "rainbow-blocks", + }, + priority = { + [""] = 110, + lua = 210, + }, + highlight = { + "RainbowDelimiterViolet", + "RainbowDelimiterBlue", + "RainbowDelimiterOrange", + "RainbowDelimiterYellow", + "RainbowDelimiterRed", + "RainbowDelimiterGreen", + "RainbowDelimiterCyan", + }, + } + end, +}