Compare commits
	
		
			1 Commits
		
	
	
		
			main
			...
			a1f228b872
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					a1f228b872 | 
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1 +0,0 @@
 | 
			
		||||
lazy-lock.json
 | 
			
		||||
@@ -44,13 +44,10 @@ return {
 | 
			
		||||
	{ import = "astrocommunity.recipes.cache-colorscheme" },
 | 
			
		||||
	{ import = "astrocommunity.recipes.neo-tree-dark" },
 | 
			
		||||
	{ import = "astrocommunity.recipes.neovide" },
 | 
			
		||||
  -- { import = "astrocommunity.recipes.ai" },
 | 
			
		||||
 | 
			
		||||
	-- Completion
 | 
			
		||||
	{ import = "astrocommunity.completion.blink-cmp-git" },
 | 
			
		||||
	{ import = "astrocommunity.completion.blink-cmp-emoji" },
 | 
			
		||||
  -- { import = "astrocommunity.completion.cmp-nerdfont" },
 | 
			
		||||
  { import = "astrocommunity.completion.minuet-ai-nvim" },
 | 
			
		||||
	-- { import = "astrocommunity.completion.cmp-spell" },
 | 
			
		||||
	-- { import = "astrocommunity.completion.copilot-lua-cmp" },
 | 
			
		||||
 | 
			
		||||
@@ -60,18 +57,15 @@ return {
 | 
			
		||||
 | 
			
		||||
	-- Individual plugins (misc)
 | 
			
		||||
 | 
			
		||||
  { import = "astrocommunity.workflow.hardtime-nvim" }, -- Display hints to get rid of bad habits
 | 
			
		||||
	-- { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" }, -- display a column when text width exceed defined limit
 | 
			
		||||
	{ import = "astrocommunity.diagnostics.trouble-nvim" },
 | 
			
		||||
	{ import = "astrocommunity.editing-support.nvim-devdocs" },
 | 
			
		||||
	{ import = "astrocommunity.git.diffview-nvim" },
 | 
			
		||||
	{ import = "astrocommunity.markdown-and-latex.render-markdown-nvim" },
 | 
			
		||||
  -- { import = "astrocommunity.markdown-and-latex.markview-nvim" },
 | 
			
		||||
	{ import = "astrocommunity.motion.marks-nvim" }, -- Display marks in the sign column
 | 
			
		||||
	{ import = "astrocommunity.workflow.hardtime-nvim" }, -- Display hints to get rid of bad habits
 | 
			
		||||
	{ import = "astrocommunity.programming-language-support.kulala-nvim" }, -- A minimal HTTP-client interface for Neovim
 | 
			
		||||
 | 
			
		||||
  -- Disabled
 | 
			
		||||
 | 
			
		||||
  -- { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" }, -- display a column when text width exceed defined limit
 | 
			
		||||
	-- { import = "astrocommunity.editing-support.chatgpt-nvim" },
 | 
			
		||||
	-- { import = "astrocommunity.programming-language-support.rest-nvim" },
 | 
			
		||||
	-- { import = "astrocommunity.project.project-nvim" },
 | 
			
		||||
 
 | 
			
		||||
@@ -39,7 +39,7 @@ return {
 | 
			
		||||
    options = {
 | 
			
		||||
      opt = { -- vim.opt.<key>
 | 
			
		||||
        number = true, -- sets vim.opt.number
 | 
			
		||||
        relativenumber = true, -- sets vim.opt.relativenumber
 | 
			
		||||
        relativenumber = false, -- sets vim.opt.relativenumber
 | 
			
		||||
        spell = false, -- sets vim.opt.spell
 | 
			
		||||
        spelllang = "fr", -- Set spell language to french
 | 
			
		||||
        signcolumn = "yes", -- sets vim.opt.signcolumn to yes
 | 
			
		||||
@@ -49,6 +49,7 @@ return {
 | 
			
		||||
        -- configure global vim variables (vim.g)
 | 
			
		||||
        -- NOTE: `mapleader` and `maplocalleader` must be set in the AstroNvim opts or before `lazy.setup`
 | 
			
		||||
        -- This can be found in the `lua/lazy_setup.lua` file
 | 
			
		||||
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
    -- Mappings can be configured through AstroCore as well.
 | 
			
		||||
@@ -81,32 +82,15 @@ return {
 | 
			
		||||
 | 
			
		||||
        -- Normal mode : Custom mappings
 | 
			
		||||
        ["<F2>"] = { "<cmd>Neotree toggle<cr>", desc = "File Explorer" }, -- F26 corresponds to <Ctrl+F2> on my keyboard
 | 
			
		||||
        ["<F3>"] = {
 | 
			
		||||
          function() require("astrocore").toggle_term_cmd { cmd = "lazygit", direction = "float" } end,
 | 
			
		||||
          desc = "Lazygit terminal",
 | 
			
		||||
        },
 | 
			
		||||
        ["<F4>"] = {
 | 
			
		||||
          function() require("astrocore").toggle_term_cmd { cmd = "tig", direction = "float" } end,
 | 
			
		||||
          desc = "Tig terminal",
 | 
			
		||||
        },
 | 
			
		||||
        ["<F3>"] = { function() require("astrocore").toggle_term_cmd({cmd="lazygit", direction="float"}) end, desc = "Lazygit terminal" }, -- F27 corresponds to <Ctrl+F3> on my keyboard
 | 
			
		||||
        ["<F4>"] = { function() require("astrocore").toggle_term_cmd({cmd="tig", direction="float"}) end, desc = "Tig terminal" }, -- F28 corresponds to <Ctrl+F4> on my keyboard
 | 
			
		||||
      },
 | 
			
		||||
      -- Insert mode : Custom mappings
 | 
			
		||||
      i = {
 | 
			
		||||
        ["<F2>"] = { "<cmd>Neotree toggle<cr>", desc = "File Explorer" }, -- F26 corresponds to <Ctrl+F2> on my keyboard
 | 
			
		||||
        ["<F3>"] = {
 | 
			
		||||
          function() require("astrocore").toggle_term_cmd { cmd = "lazygit", direction = "float" } end,
 | 
			
		||||
          desc = "Lazygit terminal",
 | 
			
		||||
        ["<F3>"] = { function() require("astrocore").toggle_term_cmd({cmd="lazygit", direction="float"}) end, desc = "Lazygit terminal" }, -- F27 corresponds to <Ctrl+F3> on my keyboard
 | 
			
		||||
        ["<F4>"] = { function() require("astrocore").toggle_term_cmd({cmd="tig", direction="float"}) end, desc = "Tig terminal" }, -- F28 corresponds to <Ctrl+F4> on my keyboard
 | 
			
		||||
      },
 | 
			
		||||
        ["<F4>"] = {
 | 
			
		||||
          function() require("astrocore").toggle_term_cmd { cmd = "tig", direction = "float" } end,
 | 
			
		||||
          desc = "Tig terminal",
 | 
			
		||||
        },
 | 
			
		||||
      },
 | 
			
		||||
      -- INFO:
 | 
			
		||||
      -- F26 corresponds to <Ctrl+F2> on my keyboard
 | 
			
		||||
      -- F27 corresponds to <Ctrl+F3> on my keyboard
 | 
			
		||||
      -- F28 corresponds to <Ctrl+F4> on my keyboard
 | 
			
		||||
 | 
			
		||||
      -- Terminal mode : Custom mappings
 | 
			
		||||
      t = {
 | 
			
		||||
        -- Switch to normal mode in terminal mode
 | 
			
		||||
@@ -118,15 +102,10 @@ return {
 | 
			
		||||
        ["<C-j>"] = false,
 | 
			
		||||
        ["<C-k>"] = false,
 | 
			
		||||
        -- My terms
 | 
			
		||||
        ["<F3>"] = {
 | 
			
		||||
          function() require("astrocore").toggle_term_cmd { name = "LazyGit", cmd = "lazygit", direction = "float" } end,
 | 
			
		||||
          desc = "Lazygit terminal",
 | 
			
		||||
        }, -- F27 corresponds to <Ctrl+F3> on my keyboard
 | 
			
		||||
        ["<F4>"] = {
 | 
			
		||||
          function() require("astrocore").toggle_term_cmd { name = "Tig", cmd = "tig", direction = "float" } end,
 | 
			
		||||
          desc = "Tig terminal",
 | 
			
		||||
        }, -- F28 corresponds to <Ctrl+F4> on my keyboard
 | 
			
		||||
        ["<F3>"] = { function() require("astrocore").toggle_term_cmd({cmd="lazygit", direction="float"}) end, desc = "Lazygit terminal" }, -- F27 corresponds to <Ctrl+F3> on my keyboard
 | 
			
		||||
        ["<F4>"] = { function() require("astrocore").toggle_term_cmd({cmd="tig", direction="float"}) end, desc = "Tig terminal" }, -- F28 corresponds to <Ctrl+F4> on my keyboard
 | 
			
		||||
      },
 | 
			
		||||
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,62 +0,0 @@
 | 
			
		||||
local prefix = "<Leader>A"
 | 
			
		||||
 | 
			
		||||
---@type LazySpec
 | 
			
		||||
return {
 | 
			
		||||
  {
 | 
			
		||||
    "olimorris/codecompanion.nvim",
 | 
			
		||||
    dependencies = {
 | 
			
		||||
      "nvim-lua/plenary.nvim",
 | 
			
		||||
      "nvim-treesitter/nvim-treesitter",
 | 
			
		||||
      {
 | 
			
		||||
        "AstroNvim/astrocore",
 | 
			
		||||
        ---@param opts AstroCoreOpts
 | 
			
		||||
        opts = function(_, opts)
 | 
			
		||||
          if not opts.mappings then opts.mappings = {} end
 | 
			
		||||
 | 
			
		||||
          opts.mappings.n[prefix] = { desc = require("astroui").get_icon("CodeCompanion", 1, true) .. "CodeCompanion" }
 | 
			
		||||
          opts.mappings.v[prefix] = { desc = require("astroui").get_icon("CodeCompanion", 1, true) .. "CodeCompanion" }
 | 
			
		||||
 | 
			
		||||
          opts.mappings.n[prefix .. "c"] = { "<cmd>CodeCompanionChat Toggle<cr>", desc = "Toggle chat" }
 | 
			
		||||
          opts.mappings.v[prefix .. "c"] = { "<cmd>CodeCompanionChat Toggle<cr>", desc = "Toggle chat" }
 | 
			
		||||
 | 
			
		||||
          opts.mappings.n[prefix .. "p"] = { "<cmd>CodeCompanionActions<cr>", desc = "Open action palette" }
 | 
			
		||||
          opts.mappings.v[prefix .. "p"] = { "<cmd>CodeCompanionActions<cr>", desc = "Open action palette" }
 | 
			
		||||
 | 
			
		||||
          opts.mappings.n[prefix .. "q"] = { "<cmd>CodeCompanion<cr>", desc = "Open inline assistant" }
 | 
			
		||||
          opts.mappings.v[prefix .. "q"] = { "<cmd>CodeCompanion<cr>", desc = "Open inline assistant" }
 | 
			
		||||
 | 
			
		||||
          opts.mappings.v[prefix .. "a"] = { "<cmd>CodeCompanionChat Add<cr>", desc = "Add selection to chat" }
 | 
			
		||||
 | 
			
		||||
          -- Expand cc to CodeCompanion in cmdline mode
 | 
			
		||||
          vim.cmd [[cab cc CodeCompanion]]
 | 
			
		||||
        end,
 | 
			
		||||
      },
 | 
			
		||||
      { "AstroNvim/astroui", opts = { icons = { CodeCompanion = "" } } },
 | 
			
		||||
    },
 | 
			
		||||
    event = "User AstroFile",
 | 
			
		||||
    cmd = {
 | 
			
		||||
      "CodeCompanion",
 | 
			
		||||
      "CodeCompanionActions",
 | 
			
		||||
      "CodeCompanionChat",
 | 
			
		||||
      "CodeCompanionCmd",
 | 
			
		||||
    },
 | 
			
		||||
    opts = {
 | 
			
		||||
      strategies = {
 | 
			
		||||
        chat = {
 | 
			
		||||
          adapter = "mistral",
 | 
			
		||||
        },
 | 
			
		||||
        inline = {
 | 
			
		||||
          adapter = "mistral",
 | 
			
		||||
        },
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "MeanderingProgrammer/render-markdown.nvim",
 | 
			
		||||
    optional = true,
 | 
			
		||||
    opts = function(_, opts)
 | 
			
		||||
      if not opts.file_types then opts.file_types = { "markdown" } end
 | 
			
		||||
      opts.file_types = require("astrocore").list_insert_unique(opts.file_types, { "codecompanion" })
 | 
			
		||||
    end,
 | 
			
		||||
  },
 | 
			
		||||
}
 | 
			
		||||
@@ -1,71 +0,0 @@
 | 
			
		||||
-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 | 
			
		||||
return {
 | 
			
		||||
  "milanglacier/minuet-ai.nvim",
 | 
			
		||||
  opts = {
 | 
			
		||||
    -- provider = "codestral",
 | 
			
		||||
    virtualtext = {
 | 
			
		||||
      auto_trigger_ft = { "sh", "lua", "python", "yaml", "json" },
 | 
			
		||||
      keymap = {
 | 
			
		||||
        -- accept whole completion
 | 
			
		||||
        accept = "<A-y>",
 | 
			
		||||
        -- accept one line
 | 
			
		||||
        accept_line = "<A-l>",
 | 
			
		||||
        -- accept n lines (prompts for number)
 | 
			
		||||
        -- e.g. "A-z 2 CR" will accept 2 lines
 | 
			
		||||
        accept_n_lines = "<A-z>",
 | 
			
		||||
        -- Cycle to prev completion item, or manually invoke completion
 | 
			
		||||
        prev = "<A-[>",
 | 
			
		||||
        -- Cycle to next completion item, or manually invoke completion
 | 
			
		||||
        next = "<A-]>",
 | 
			
		||||
        -- Dismiss
 | 
			
		||||
        dismiss = "<A-c>",
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
  -- specs = {
 | 
			
		||||
  --   "Saghen/blink.cmp",
 | 
			
		||||
  --   optional = true,
 | 
			
		||||
  --   opts = {
 | 
			
		||||
  --     keymap = {
 | 
			
		||||
  --       -- Manually invoke minuet completion.
 | 
			
		||||
  --       ["<A-y>"] = require("minuet").make_blink_map(),
 | 
			
		||||
  --     },
 | 
			
		||||
  --     sources = {
 | 
			
		||||
  --       -- Enable minuet for autocomplete
 | 
			
		||||
  --       default = { "lsp", "path", "buffer", "snippets", "minuet" },
 | 
			
		||||
  --       -- For manual completion only, remove 'minuet' from default
 | 
			
		||||
  --       providers = {
 | 
			
		||||
  --         minuet = {
 | 
			
		||||
  --           name = "minuet",
 | 
			
		||||
  --           module = "minuet.blink",
 | 
			
		||||
  --           async = true,
 | 
			
		||||
  --           -- Should match minuet.config.request_timeout * 1000,
 | 
			
		||||
  --           -- since minuet.config.request_timeout is in seconds
 | 
			
		||||
  --           timeout_ms = 3000,
 | 
			
		||||
  --           score_offset = 50, -- Gives minuet higher priority among suggestions
 | 
			
		||||
  --         },
 | 
			
		||||
  --       },
 | 
			
		||||
  --     },
 | 
			
		||||
  --     -- Recommended to avoid unnecessary request
 | 
			
		||||
  --     completion = { trigger = { prefetch_on_insert = false } },
 | 
			
		||||
  --   },
 | 
			
		||||
  -- },
 | 
			
		||||
  -- specs = {
 | 
			
		||||
  --   {
 | 
			
		||||
  --     "AstroNvim/astrocore",
 | 
			
		||||
  --     opts = {
 | 
			
		||||
  --       options = {
 | 
			
		||||
  --         g = {
 | 
			
		||||
  --           -- set the ai_accept function
 | 
			
		||||
  --           ai_accept = function()
 | 
			
		||||
  --             if require("minuet.virtualtext").action.is_visible then
 | 
			
		||||
  --               vim.api.nvim_input(require("minuet.virtualtext").action.accept_n_lines)
 | 
			
		||||
  --               return true
 | 
			
		||||
  --             end
 | 
			
		||||
  --           end,
 | 
			
		||||
  --         },
 | 
			
		||||
  --       },
 | 
			
		||||
  --     },
 | 
			
		||||
  --   },
 | 
			
		||||
  -- },
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user