From fa438257128e164a8276fb9ac8b90d509f40997b Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Wed, 16 Aug 2023 16:49:27 +0200 Subject: [PATCH] Update config --- lua/configs/lspconfig.lua | 23 +++++++++++++++++++++-- lua/mappings.lua | 7 ++++++- lua/plugins.lua | 30 ++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index e01e8b1..27052d2 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -2,7 +2,7 @@ require("mason-lspconfig").setup_handlers { -- The first entry (without a key) will be the default handler -- and will be called for each installed server that doesn't have -- a dedicated handler. - function (server_name) -- default handler (optional) + function(server_name) -- default handler (optional) require("lspconfig")[server_name].setup {} end, -- Next, you can provide a dedicated handler for specific servers. @@ -10,7 +10,7 @@ require("mason-lspconfig").setup_handlers { -- ["rust_analyzer"] = function () -- require("rust-tools").setup {} -- end - ["lua_ls"] = function () + ["lua_ls"] = function() require("lspconfig").lua_ls.setup { settings = { Lua = { @@ -30,5 +30,24 @@ require("mason-lspconfig").setup_handlers { }, }, } + end, + + ["ltex"] = function() + require("lspconfig").ltex.setup { + settings = { + ltex = { + language = "fr-FR", + }, + -- set formatter + formatters = { + ["latexindent"] = { + exe = "latexindent", + args = { "-sl", "-g /dev/stderr" }, + stdin = true, + }, + }, + }, + + } end } diff --git a/lua/mappings.lua b/lua/mappings.lua index f0dfcb4..6f9ed37 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -12,6 +12,11 @@ vim.keymap.set('n', 'H', require('treesj').toggle) vim.keymap.set( 'n', 'ff', + " Telescope find_files follow=true no_ignore=true " +) +vim.keymap.set( + 'n', + 'fF', " Telescope find_files follow=true no_ignore=true hidden=true " ) vim.keymap.set('n', 'ft', MiniFiles.open, { desc = "Open file tree" }) @@ -25,7 +30,7 @@ vim.keymap.set({'n', 'v', 'o'}, '', require('tree-climber').goto_parent) vim.keymap.set({'n', 'v', 'o'}, '', require('tree-climber').goto_child) vim.keymap.set({'n', 'v', 'o'}, '', require('tree-climber').goto_next) vim.keymap.set({'n', 'v', 'o'}, '', require('tree-climber').goto_prev) - +vim.keymap.set('n', 'N', " Neogit ", { desc = "Open Neogit" }) -- Global mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions diff --git a/lua/plugins.lua b/lua/plugins.lua index 1e05f48..486e304 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -68,6 +68,8 @@ local plugins = { treesitter = true, mini = true, mason = true, + neogit = true, + illuminate = false, telescope = { enabled = true, style = "nvchad" @@ -142,16 +144,15 @@ local plugins = { }, { "zbirenbaum/copilot.lua", - cmd = { "Copilot", "StartCopilot" }, + cmd = { "Copilot" }, opts = { suggestion = { auto_trigger = true, - } + }, + filetypes = { + markdown = true, + }, }, - config = function() - require("copilot").setup() - vim.cmd("command! StartCopilot Copilot suggestion") - end, }, { 'nvim-lualine/lualine.nvim', @@ -292,7 +293,14 @@ local plugins = { event = "VeryLazy", dependencies = { "nvim-treesitter/nvim-treesitter" }, config = function() - require("wildfire").setup() + require("wildfire").setup({ + keymaps = { + init_selection = "", + node_incremental = "", + node_decremental = "", + } + } + ) end, }, { "lukas-reineke/indent-blankline.nvim" }, @@ -317,12 +325,14 @@ local plugins = { { "NeogitOrg/neogit", dependencies = { - "nvim-lua/plenary.nvim", -- required + "nvim-lua/plenary.nvim", -- required "nvim-telescope/telescope.nvim", -- optional - "sindrets/diffview.nvim", -- optional + "sindrets/diffview.nvim", -- optional }, config = true - } + }, + { "RRethy/vim-illuminate" }, + { "ofseed/lualine-copilot" } } return plugins