From 7590b3cbc124913256ff06de21f317c5ab80efb1 Mon Sep 17 00:00:00 2001 From: Albin Chaboissier Date: Sat, 2 May 2026 20:51:17 +0200 Subject: [PATCH] projet c --- init.lua | 2 +- lua/config.lua | 6 +++++- lua/plugins/colorscheme.lua | 4 ++-- lua/plugins/conform.lua | 18 ++++++++++++++++++ lua/plugins/init.lua | 2 ++ lua/plugins/lsp.lua | 4 +--- lua/plugins/neogen.lua | 3 +++ nvim-pack-lock.json | 8 ++++++++ 8 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 lua/plugins/conform.lua create mode 100644 lua/plugins/neogen.lua diff --git a/init.lua b/init.lua index e8b8e83..83d879f 100644 --- a/init.lua +++ b/init.lua @@ -1,5 +1,5 @@ require("config") require("plugins") -require('vim._core.ui2').enable() +require("vim._core.ui2").enable() diff --git a/lua/config.lua b/lua/config.lua index 14925f8..50deb51 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -79,4 +79,8 @@ vim.keymap.set("n", "", "zz") vim.keymap.set("n", "n", "nzzzv") vim.keymap.set("n", "N", "Nzzzv") - +vim.filetype.add({ + extension = { + h = "c", + }, +}) diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 1043ef7..b861c1a 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,5 +1,5 @@ -vim.pack.add({"https://github.com/rktjmp/lush.nvim"}) -vim.pack.add({"https://github.com/savq/melange-nvim" }) +vim.pack.add({ "https://github.com/rktjmp/lush.nvim" }) +vim.pack.add({ "https://github.com/savq/melange-nvim" }) -- vim.g.melange_enable_font_variants = 0 -- disable font variants -- require("lush") -- make sure Lush is installed diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua new file mode 100644 index 0000000..b73d288 --- /dev/null +++ b/lua/plugins/conform.lua @@ -0,0 +1,18 @@ +vim.pack.add({ "https://github.com/stevearc/conform.nvim" }) + +local conform = require("conform") + +conform.setup({ + formatters_by_ft = { + c = { "uncrustify" }, + }, + format_on_save = { + -- These options will be passed to conform.format() + timeout_ms = 500, + lsp_format = "fallback", + } +}) + +-- conform.formatters.uncrustify = { +-- prepend_args = { "-l", "c", "-c", "/home/albin/coding-projects/uncrustify.cfg" }, +-- } diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index cde5d66..79cc06c 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -9,3 +9,5 @@ require("plugins.lsplines") require("plugins.mini") require("plugins.flash") require("plugins.git") +require("plugins.conform") +require("plugins.neogen") diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 905036d..fddc26a 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,5 +1,4 @@ vim.pack.add({ 'https://github.com/neovim/nvim-lspconfig' }) - vim.lsp.enable({ 'lua_ls' }) vim.lsp.enable({ 'clangd' }) @@ -10,14 +9,13 @@ vim.lsp.config("rust_analyzer", { { postfix = { enable = true, }, }, - ['rust-analyzer'] = { check = { command = "clippy", }, } }, } -}) +) vim.lsp.enable('rust_analyzer') vim.keymap.set("n", "t", vim.diagnostic.open_float) diff --git a/lua/plugins/neogen.lua b/lua/plugins/neogen.lua new file mode 100644 index 0000000..075d15a --- /dev/null +++ b/lua/plugins/neogen.lua @@ -0,0 +1,3 @@ +vim.pack.add({ "https://github.com/danymat/neogen" }) + +require("neogen").setup({}) diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 848b5b6..3b7cfe3 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -12,6 +12,10 @@ "rev": "b51a659459df8d078201aefc995db8175ed55e84", "src": "https://github.com/xzbdmw/colorful-menu.nvim" }, + "conform.nvim": { + "rev": "dca1a190aa85f9065979ef35802fb77131911106", + "src": "https://github.com/stevearc/conform.nvim" + }, "flash.nvim": { "rev": "fcea7ff883235d9024dc41e638f164a450c14ca2", "src": "https://github.com/folke/flash.nvim" @@ -48,6 +52,10 @@ "rev": "704b99f10a72cc05d370cfeb294ff83412a8ab55", "src": "https://github.com/jake-stewart/multicursor.nvim" }, + "neogen": { + "rev": "23e7e9f883d01289ebd90e98025acc860ea26366", + "src": "https://github.com/danymat/neogen" + }, "nvim-lspconfig": { "rev": "bedca8b426b2fee0ccac596d167d71bbe971253f", "src": "https://github.com/neovim/nvim-lspconfig"