From e264fcba6af49a1e27b9ee0c46ff5a7dec53585e Mon Sep 17 00:00:00 2001 From: Alessandro Date: Fri, 18 Oct 2024 11:10:45 +0200 Subject: [PATCH] Reformat all file / Add md peview + ansiblels --- nvim/lazy-lock.json | 19 ++++++++++--------- nvim/lua/chadrc.lua | 2 +- nvim/lua/configs/default-lsp.lua | 1 + nvim/lua/configs/lspconfig.lua | 20 +++++++++----------- nvim/lua/options.lua | 13 ++++++++++++- nvim/lua/plugins/crates.lua | 28 ++++++++++++++-------------- nvim/lua/plugins/markpreview.lua | 9 +++++++++ nvim/lua/plugins/ufo.lua | 8 ++++---- 8 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 nvim/lua/plugins/markpreview.lua diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 316e638..0e25974 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,39 +1,40 @@ { "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, - "NvChad": { "branch": "v2.5", "commit": "f6025f0788880989484733c90deff07dff01ef02" }, + "NvChad": { "branch": "v2.5", "commit": "8792679a08c6747ba3f5890a01561442abec6935" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, - "base46": { "branch": "v2.5", "commit": "177af7c0e492f6332bf78675a47b8983b1a32291" }, + "base46": { "branch": "v2.5", "commit": "fec9fa583025e69e0c4f902bd61990e8d13d1975" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, + "conform.nvim": { "branch": "master", "commit": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3" }, "crates.nvim": { "branch": "main", "commit": "1c924d5a9ea3496c4e1a02d0d51388ba809f8468" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, "image.nvim": { "branch": "master", "commit": "88e9693e188b8464b1c426aebb4389fd9db2fcbf" }, "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "menu": { "branch": "main", "commit": "349930b98590f10784e66340963aad2b4bf862c7" }, + "menu": { "branch": "main", "commit": "ee85b2e394fde354bd24e35ff7a688d10c9212fa" }, "minty": { "branch": "main", "commit": "7c2a6452922313e10ff46aea49a4bb5e50e1ac68" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lsp-endhints": { "branch": "main", "commit": "391ef40521b631a8a2fb7aef78db6967ead6b39d" }, - "nvim-lspconfig": { "branch": "master", "commit": "c38af37e4ee71d70b7d60267d96b0a83e5d346f5" }, - "nvim-tree.lua": { "branch": "master", "commit": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe" }, - "nvim-treesitter": { "branch": "master", "commit": "19079207ba4a8c7ed956f40a111a22b1a2dfa6e8" }, + "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" }, + "nvim-tree.lua": { "branch": "master", "commit": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905" }, + "nvim-treesitter": { "branch": "master", "commit": "03452942dfbd998701d4123ccad2090e1bc7e9f1" }, "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" }, - "rustaceanvim": { "branch": "master", "commit": "29f42cc149f915d771c550b6dfe7c788d856cf04" }, + "rustaceanvim": { "branch": "master", "commit": "819c3197bc308d81ea9c8cf75b01f34eb3f0e03b" }, "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, - "ui": { "branch": "v3.0", "commit": "99dae0e715fc67d8a38f27b2fc7b8bd47c23e817" }, + "ui": { "branch": "v3.0", "commit": "c502942c30385c7977d3f128f5da8ec778f509b3" }, "volt": { "branch": "main", "commit": "43f72b49037c191eb3cfe26ba7a5574b4bfce226" }, "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } } diff --git a/nvim/lua/chadrc.lua b/nvim/lua/chadrc.lua index 79ffda7..ba09e85 100644 --- a/nvim/lua/chadrc.lua +++ b/nvim/lua/chadrc.lua @@ -96,7 +96,7 @@ M.ui = { }, cmp = { - style="atom_colored" + style = "atom_colored" } } diff --git a/nvim/lua/configs/default-lsp.lua b/nvim/lua/configs/default-lsp.lua index 91aae08..2fbf189 100644 --- a/nvim/lua/configs/default-lsp.lua +++ b/nvim/lua/configs/default-lsp.lua @@ -20,5 +20,6 @@ return { "ruff", "dockerfile-language-server", + "ansible-language-server", }, } diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua index d9651ad..0bf91da 100644 --- a/nvim/lua/configs/lspconfig.lua +++ b/nvim/lua/configs/lspconfig.lua @@ -9,14 +9,15 @@ local on_init = configs.on_init local capabilities = configs.capabilities local servers = { - "bashls", - "taplo", - "jdtls", - "clangd", - "pyright", - "ruff", - "dockerls", - } + "bashls", + "taplo", + "jdtls", + "clangd", + "pyright", + "ruff", + "dockerls", + "ansiblels" +} for _, lsp in ipairs(servers) do lspconfig[lsp].setup { @@ -26,8 +27,5 @@ for _, lsp in ipairs(servers) do } end - - - local lombok = vim.fn.stdpath('data') .. '/mason/packages/jdtls/lombok.jar' lspconfig.jdtls.setup { cmd = { "jdtls", "--jvm-arg=-javaagent:" .. lombok } } diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index 1521965..ebf05ae 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -8,7 +8,7 @@ require "nvchad.options" vim.lsp.inlay_hint.enable(true) vim.o.foldcolumn = "0" -- '0' is not bad -vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value +vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value vim.o.foldlevelstart = 99 vim.o.foldenable = true vim.opt.fillchars = { @@ -23,3 +23,14 @@ vim.opt.fillchars = { } vim.o.pumheight = 10 + +vim.api.nvim_create_autocmd("FileType", { + pattern = "java", + command = "setlocal shiftwidth=4 tabstop=4" +}) + +vim.filetype.add({ + extension = { + yml = 'yaml.ansible' + } +}) diff --git a/nvim/lua/plugins/crates.lua b/nvim/lua/plugins/crates.lua index 98704e9..2328036 100644 --- a/nvim/lua/plugins/crates.lua +++ b/nvim/lua/plugins/crates.lua @@ -3,18 +3,18 @@ return { tag = "stable", event = { "BufRead Cargo.toml" }, opts = { - lsp = { - enabled = true, - actions = true, - completion = true, - hover = true, - }, - completion = { - crates = { - enabled = true, - max_results = 10, - min_chars = 3, - }, - } - } + lsp = { + enabled = true, + actions = true, + completion = true, + hover = true, + }, + completion = { + crates = { + enabled = true, + max_results = 10, + min_chars = 3, + }, + } + } } diff --git a/nvim/lua/plugins/markpreview.lua b/nvim/lua/plugins/markpreview.lua new file mode 100644 index 0000000..bb96fbc --- /dev/null +++ b/nvim/lua/plugins/markpreview.lua @@ -0,0 +1,9 @@ +return { + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + build = "cd app && yarn install", + init = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, +} diff --git a/nvim/lua/plugins/ufo.lua b/nvim/lua/plugins/ufo.lua index 12bf66c..179b1a1 100644 --- a/nvim/lua/plugins/ufo.lua +++ b/nvim/lua/plugins/ufo.lua @@ -1,10 +1,10 @@ return { "kevinhwang91/nvim-ufo", opts = { - provider_selector = function(_, _, _) - return { "treesitter", "indent" } - end, - }, + provider_selector = function(_, _, _) + return { "treesitter", "indent" } + end, + }, lazy = false, dependencies = { "kevinhwang91/promise-async" }, }