Compare commits
6 Commits
main
..
astronvim_v4
| Author | SHA1 | Date | |
|---|---|---|---|
| 4b2c8fbc7b | |||
| 7ad9c34c62 | |||
| 7328b847df | |||
| 3c516c6e5c | |||
| bed1f95b7c | |||
| b3c8e11f32 |
@@ -1 +0,0 @@
|
||||
lazy-lock.json
|
||||
@@ -1,7 +0,0 @@
|
||||
column_width = 120
|
||||
line_endings = "Unix"
|
||||
indent_type = "Spaces"
|
||||
indent_width = 2
|
||||
quote_style = "AutoPreferDouble"
|
||||
call_parentheses = "None"
|
||||
collapse_simple_statement = "Always"
|
||||
@@ -1,34 +1,18 @@
|
||||
# AstroNvim Template
|
||||
# AstroNvim configuration
|
||||
|
||||
**NOTE:** This is for AstroNvim v5+
|
||||
|
||||
A template for getting started with [AstroNvim](https://github.com/AstroNvim/AstroNvim)
|
||||
**NOTE:** This is for AstroNvim v4+
|
||||
|
||||
## 🛠️ Installation
|
||||
|
||||
#### Make a backup of your current nvim and shared folder
|
||||
|
||||
```shell
|
||||
mv ~/.config/nvim ~/.config/nvim.bak
|
||||
mv ~/.local/share/nvim ~/.local/share/nvim.bak
|
||||
mv ~/.local/state/nvim ~/.local/state/nvim.bak
|
||||
mv ~/.cache/nvim ~/.cache/nvim.bak
|
||||
```
|
||||
|
||||
#### Create a new user repository from this template
|
||||
|
||||
Press the "Use this template" button above to create a new repository to store your user configuration.
|
||||
|
||||
You can also just clone this repository directly if you do not want to track your user configuration in GitHub.
|
||||
|
||||
#### Clone the repository
|
||||
|
||||
```shell
|
||||
git clone https://github.com/<your_user>/<your_repository> ~/.config/nvim
|
||||
git clone https://gitea.logerais.com/xavier/config-astronvim.git ~/.config/astronvim
|
||||
```
|
||||
|
||||
#### Start Neovim
|
||||
|
||||
```shell
|
||||
export NVIM_APPNAME=astronvim
|
||||
nvim
|
||||
```
|
||||
|
||||
+2
-95
@@ -1,3 +1,5 @@
|
||||
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
|
||||
-- AstroCommunity: import any community modules here
|
||||
-- We import this file in `lazy_setup.lua` before the `plugins/` folder.
|
||||
-- This guarantees that the specs are processed before any user plugins.
|
||||
@@ -7,99 +9,4 @@ return {
|
||||
"AstroNvim/astrocommunity",
|
||||
{ import = "astrocommunity.pack.lua" },
|
||||
-- import/override with your plugins folder
|
||||
|
||||
--
|
||||
-- Personal config
|
||||
--
|
||||
|
||||
-- Packs
|
||||
|
||||
{ import = "astrocommunity.pack.bash" },
|
||||
{ import = "astrocommunity.pack.chezmoi" },
|
||||
|
||||
{ import = "astrocommunity.pack.json" },
|
||||
{ import = "astrocommunity.pack.yaml" },
|
||||
{ import = "astrocommunity.pack.toml" },
|
||||
|
||||
{ import = "astrocommunity.pack.markdown" },
|
||||
{ import = "astrocommunity.pack.python" },
|
||||
-- { import = "astrocommunity.pack.ruby" },
|
||||
-- { import = "astrocommunity.pack.java" },
|
||||
-- { import = "astrocommunity.pack.html-css" },
|
||||
-- { import = "astrocommunity.pack.angular" },
|
||||
|
||||
-- { import = "astrocommunity.pack.ansible" },
|
||||
-- { import = "astrocommunity.pack.terraform" },
|
||||
-- { import = "astrocommunity.pack.docker" },
|
||||
-- { import = "astrocommunity.pack.helm" },
|
||||
|
||||
-- { import = "astrocommunity.pack.rainbow-delimiter-indent-blankline" },
|
||||
{ import = "astrocommunity.indent.indent-rainbowline" },
|
||||
|
||||
-- Recipes
|
||||
|
||||
{ import = "astrocommunity.recipes.disable-tabline" },
|
||||
{ import = "astrocommunity.recipes.heirline-mode-text-statusline" },
|
||||
{ import = "astrocommunity.recipes.heirline-vscode-winbar" },
|
||||
{ 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" },
|
||||
|
||||
-- Telescope
|
||||
{ import = "astrocommunity.terminal-integration.toggleterm-manager-nvim" }, -- A Telescope extension to manage Toggleterm's terminals in NeoVim
|
||||
-- { import = "astrocommunity.file-explorer.telescope-file-browser-nvim" },
|
||||
|
||||
-- Individual plugins (misc)
|
||||
|
||||
{ import = "astrocommunity.workflow.hardtime-nvim" }, -- Display hints to get rid of bad habits
|
||||
{ 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.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" },
|
||||
|
||||
-- Individual plugins (colorschemes)
|
||||
{ import = "astrocommunity.colorscheme.vscode-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.github-nvim-theme" },
|
||||
{ import = "astrocommunity.colorscheme.neosolarized-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.nord-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.nordic-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.iceberg-vim" },
|
||||
{ import = "astrocommunity.colorscheme.tokyodark-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.tokyonight-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.onedarkpro-nvim" },
|
||||
|
||||
-- Individual plugins customization
|
||||
-- {
|
||||
-- "nvim-treesitter/nvim-treesitter",
|
||||
-- opts = function(_, opts)
|
||||
-- local utils = require "astronvim.utils"
|
||||
-- if opts.ensure_installed ~= "all" then
|
||||
-- opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed,
|
||||
-- { "lua", "xml", "http", "json", "graphql" })
|
||||
-- end
|
||||
-- end,
|
||||
-- },
|
||||
|
||||
-- Now provided by core
|
||||
-- { import = "astrocommunity.bars-and-lines.vim-illuminate" }, -- highlight other uses of the word under cursor
|
||||
-- { import = "astrocommunity.editing-support.todo-comments-nvim" },
|
||||
}
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
vim.api.nvim_create_autocmd(
|
||||
"FileType", {
|
||||
desc = "Customizations for groovy files",
|
||||
pattern = { "groovy", "Jenkinsfile" },
|
||||
callback = function()
|
||||
local utils = require('astrocore')
|
||||
utils.notify("Loading autocmd customizations for groovy files")
|
||||
|
||||
-- Terminal settings
|
||||
|
||||
-- Define prefered options for the terminal
|
||||
-- local command = string.format(" groovy %s", vim.api.nvim_buf_get_name(0))
|
||||
local name = "groovy"
|
||||
local command = " groovysh"
|
||||
local direction = "horizontal"
|
||||
local size = 25
|
||||
local toggle_key = "<F10>"
|
||||
|
||||
-- Define a new terminal dedicated to groovy
|
||||
local toggleterm = require('toggleterm')
|
||||
local Terminal = require('toggleterm.terminal').Terminal
|
||||
local groovy = Terminal:new({
|
||||
name = name,
|
||||
cmd = command,
|
||||
direction = direction,
|
||||
size = size,
|
||||
hidden = true,
|
||||
close_on_exit = true,
|
||||
})
|
||||
|
||||
-- Spawn in background so it will be ready to execute code
|
||||
groovy:spawn()
|
||||
|
||||
-- -- Define a function to run code from current buffer in the terminal
|
||||
-- function _Groovy_buffer_exec()
|
||||
-- if not groovy:is_open() then groovy:open(size, direction) end
|
||||
-- groovy:send(' clear', true)
|
||||
-- groovy:send(command, true)
|
||||
-- end
|
||||
|
||||
--
|
||||
-- Define a function to run code from visual selection in the terminal
|
||||
function _Groovy_visual_exec()
|
||||
if not groovy:is_open() then groovy:open(size, direction) end
|
||||
toggleterm.send_lines_to_terminal("visual_lines", true, { groovy.id })
|
||||
end
|
||||
|
||||
-- Define a keymap to run the current buffer in the terminal
|
||||
vim.keymap.set({ 'n', 'i', 'v', 't' }, '<F10>', function() groovy:toggle(size, direction) end,
|
||||
{ noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("v", "<F22>", "<cmd>lua _Groovy_visual_exec()<cr>", { noremap = true, silent = true })
|
||||
|
||||
-- Vim settings
|
||||
|
||||
vim.opt_local.signcolumn = 'auto'
|
||||
vim.opt_local.foldcolumn = 'auto'
|
||||
vim.opt_local.makeprg = 'groovy %'
|
||||
vim.keymap.set({ 'n', 'i', 'v' }, '<F5>', ':make<CR>', { buffer = true })
|
||||
|
||||
-- vim.keymap.nnoremap { '<leader>²x', ':make<CR>' }
|
||||
-- vim.keymap.inoremap { '<leader>²x', '<ESC>:make<CR>' }
|
||||
|
||||
-- DevDocs
|
||||
require('nvim-devdocs').setup({
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
})
|
||||
vim.keymap.set({ 'n', 'i', 'v' }, '<F1>', ':DevdocsOpen groovy-2.4<CR>', { buffer = true })
|
||||
end,
|
||||
}
|
||||
)
|
||||
@@ -0,0 +1,4 @@
|
||||
require "custom.autocmds.text"
|
||||
require "custom.autocmds.terminal"
|
||||
require "custom.autocmds.groovy"
|
||||
require "custom.autocmds.python"
|
||||
@@ -0,0 +1,87 @@
|
||||
vim.api.nvim_create_autocmd(
|
||||
"FileType", {
|
||||
pattern = { "python" },
|
||||
desc = "Customizations for python files",
|
||||
callback = function()
|
||||
local utils = require('astrocore')
|
||||
utils.notify("Loading autocmd customizations for python files")
|
||||
|
||||
-- Terminal settings
|
||||
|
||||
-- Define prefered options for the terminal
|
||||
local name = "python"
|
||||
local direction = "vertical"
|
||||
local size = 100
|
||||
|
||||
-- Define a new terminal dedicated to python
|
||||
local Terminal = require('toggleterm.terminal').Terminal
|
||||
local python = Terminal:new({
|
||||
name = name,
|
||||
size = size,
|
||||
direction = direction,
|
||||
hidden = true,
|
||||
-- close_on_exit = true,
|
||||
})
|
||||
|
||||
-- Spawn it in background so it will be ready to execute code
|
||||
python:spawn()
|
||||
|
||||
-- Define a function to toggle the terminal
|
||||
function _Python_terminal_toggle()
|
||||
python:toggle(size, direction)
|
||||
end
|
||||
|
||||
-- Define a function to run code from current buffer in the terminal
|
||||
function _Python_buffer_exec()
|
||||
local command = string.format(" python %s", vim.api.nvim_buf_get_name(0))
|
||||
if not python:is_open() then python:open(size, direction) end
|
||||
python:send(' clear', true)
|
||||
python:send(command, true)
|
||||
end
|
||||
|
||||
-- Define a keymap to run the current buffer in the terminal
|
||||
-- <F10> corresponds to F10 on my keyboard
|
||||
-- <F22> corresponds to Shift + F10 on my keyboard
|
||||
-- <F34> corresponds to Ctrl + F10 on my keyboard
|
||||
vim.api.nvim_set_keymap("n", "<F10>",
|
||||
"<cmd>lua _Python_terminal_toggle()<cr>",
|
||||
{ noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("i", "<F10>",
|
||||
"<cmd>lua _Python_terminal_toggle()<cr>",
|
||||
{ noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("t", "<F10>",
|
||||
"<cmd>lua _Python_terminal_toggle()<cr>",
|
||||
{ noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("n", "<F34>",
|
||||
-- "<cmd>TermExec name=python cmd='python %'<cr>",
|
||||
'<cmd>lua _Python_buffer_exec()<cr>',
|
||||
{ noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("i", "<F34>",
|
||||
-- "<cmd>TermExec name=python cmd='python %'<cr>",
|
||||
'<cmd>lua _Python_buffer_exec()<cr>',
|
||||
{ noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("t", "<F34>",
|
||||
-- "<cmd>TermExec name=python cmd='python %'<cr>",
|
||||
'<cmd>lua _Python_buffer_exec()<cr>',
|
||||
{ noremap = true, silent = true })
|
||||
|
||||
utils.notify("Type <F10> to toggle the python terminal")
|
||||
utils.notify("Type Ctrl+<F10> to run current buffer in the python terminal")
|
||||
|
||||
-- DevDocs
|
||||
require('nvim-devdocs').setup({
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
})
|
||||
vim.keymap.set({ 'n', 'i', 'v' }, '<F1>', ':DevdocsOpen python-3.10<CR>', { buffer = true })
|
||||
|
||||
utils.notify("Type <F1> to access DevDocs documentation for python")
|
||||
|
||||
-- Vim settings
|
||||
|
||||
vim.opt_local.signcolumn = "auto"
|
||||
vim.opt_local.foldcolumn = "auto"
|
||||
end,
|
||||
}
|
||||
)
|
||||
@@ -0,0 +1,6 @@
|
||||
vim.api.nvim_create_autocmd("TermOpen", {
|
||||
desc = "Auto switch to insert mode for terminal",
|
||||
group = vim.api.nvim_create_augroup("term_auto_insert", { clear = true }),
|
||||
pattern = "term://*",
|
||||
command = "startinsert",
|
||||
})
|
||||
@@ -0,0 +1,9 @@
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
desc = "Enable wrap and spell for text like documents",
|
||||
group = vim.api.nvim_create_augroup("auto_spell", { clear = true }),
|
||||
pattern = { "gitcommit", "markdown", "text", "plaintex" },
|
||||
callback = function()
|
||||
vim.opt_local.wrap = true
|
||||
vim.opt_local.spell = true
|
||||
end,
|
||||
})
|
||||
@@ -0,0 +1,67 @@
|
||||
-- AstroCommunity: import any community modules here
|
||||
-- We import this file in `lazy_setup.lua` before the `plugins/` folder.
|
||||
-- This guarantees that the specs are processed before any user plugins.
|
||||
|
||||
---@type LazySpec
|
||||
return {
|
||||
"AstroNvim/astrocommunity",
|
||||
{ import = "astrocommunity.pack.lua" },
|
||||
-- import/override with your plugins folder
|
||||
|
||||
--
|
||||
-- Personal config
|
||||
--
|
||||
|
||||
-- Packs
|
||||
{ import = "astrocommunity.pack.bash" },
|
||||
{ import = "astrocommunity.pack.json" },
|
||||
{ import = "astrocommunity.pack.yaml" },
|
||||
{ import = "astrocommunity.pack.toml" },
|
||||
-- { import = "astrocommunity.pack.markdown" },
|
||||
-- { import = "astrocommunity.pack.ansible" },
|
||||
-- { import = "astrocommunity.pack.docker" },
|
||||
-- { import = "astrocommunity.pack.helm" },
|
||||
-- { import = "astrocommunity.pack.terraform" },
|
||||
-- { import = "astrocommunity.pack.python" },
|
||||
-- { import = "astrocommunity.pack.java" },
|
||||
-- { import = "astrocommunity.pack.html-css" },
|
||||
-- { import = "astrocommunity.pack.angular" },
|
||||
|
||||
-- Individual plugins (misc)
|
||||
-- { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" },
|
||||
-- { import = "astrocommunity.completion.copilot-lua-cmp" },
|
||||
{ import = "astrocommunity.diagnostics.trouble-nvim" },
|
||||
{ import = "astrocommunity.editing-support.rainbow-delimiters-nvim" },
|
||||
{ import = "astrocommunity.editing-support.nvim-devdocs" },
|
||||
-- { import = "astrocommunity.editing-support.chatgpt-nvim" },
|
||||
{ import = "astrocommunity.indent.indent-rainbowline" },
|
||||
{ import = "astrocommunity.programming-language-support.rest-nvim" },
|
||||
{ import = "astrocommunity.project.project-nvim" },
|
||||
|
||||
-- Individual plugins (colorschemes)
|
||||
{ import = "astrocommunity.colorscheme.vscode-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.github-nvim-theme" },
|
||||
{ import = "astrocommunity.colorscheme.onedarkpro-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.tokyonight-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.tokyodark-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.neosolarized-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.nord-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.nordic-nvim" },
|
||||
{ import = "astrocommunity.colorscheme.iceberg-vim" },
|
||||
|
||||
-- Individual plugins customization
|
||||
-- {
|
||||
-- "nvim-treesitter/nvim-treesitter",
|
||||
-- opts = function(_, opts)
|
||||
-- local utils = require "astronvim.utils"
|
||||
-- if opts.ensure_installed ~= "all" then
|
||||
-- opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed,
|
||||
-- { "lua", "xml", "http", "json", "graphql" })
|
||||
-- end
|
||||
-- end,
|
||||
-- },
|
||||
--
|
||||
-- Now provided by core
|
||||
-- { import = "astrocommunity.bars-and-lines.vim-illuminate" },
|
||||
-- { import = "astrocommunity.editing-support.todo-comments-nvim" },
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
require "custom.filetypes.jenkins"
|
||||
@@ -0,0 +1,8 @@
|
||||
vim.filetype.add {
|
||||
filename = {
|
||||
["Jenkinsfile"] = "groovy",
|
||||
},
|
||||
extension = {
|
||||
Jenkinsfile = "groovy",
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
-- AstroCore provides a central place to modify mappings, vim options, autocommands, and more!
|
||||
-- Configuration documentation can be found with `:h astrocore`
|
||||
-- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
|
||||
-- as this provides autocomplete and documentation while editing
|
||||
|
||||
---@type LazySpec
|
||||
return {
|
||||
"AstroNvim/astrocore",
|
||||
---@type AstroCoreOpts
|
||||
opts = {
|
||||
-- vim options can be configured here
|
||||
options = {
|
||||
opt = {
|
||||
-- cmdheight = 1, -- Always show command line
|
||||
scrolloff = 0, -- Set scroll offset to zero so that zt and zb work as expected
|
||||
-- number = true, -- sets vim.opt.number
|
||||
relativenumber = false, -- sets vim.opt.relativenumber
|
||||
-- signcolumn = "auto", -- sets vim.opt.signcolumn to auto
|
||||
-- foldcolumn = "auto", -- sets vim.opt.foldcolumn to auto
|
||||
-- spell = false, -- sets vim.opt.spell
|
||||
spelllang = "fr", -- Set spell language to french
|
||||
-- wrap = false, -- sets vim.opt.wrap
|
||||
},
|
||||
},
|
||||
-- Mappings can be configured through AstroCore as well.
|
||||
-- NOTE: keycodes follow the casing in the vimdocs. For example, `<Leader>` must be capitalized
|
||||
mappings = {
|
||||
-- Normal mode
|
||||
n = {
|
||||
-- ["<Leader>bb"] = { "<cmd>tabnew<cr>", desc = "New tab" },
|
||||
-- ["<Leader>bc"] = { "<cmd>BufferLinePickClose<cr>", desc = "Pick to close" },
|
||||
-- ["<Leader>bj"] = { "<cmd>BufferLinePick<cr>", desc = "Pick to jump" },
|
||||
-- ["<Leader>bt"] = { "<cmd>BufferLineSortByTabs<cr>", desc = "Sort by tabs" },
|
||||
|
||||
-- Easy buffer navigation
|
||||
["<tab>"] = { "<cmd>bnext<cr>", desc = "Switch to next buffer" },
|
||||
["<S-tab>"] = { "<cmd>bprevious<cr>", desc = "Switch to previous buffer" },
|
||||
|
||||
-- quick save
|
||||
-- ["<C-s>"] = { ":w!<cr>", desc = "Save File" }, -- change description but the same command
|
||||
|
||||
-- My telescope keybindings
|
||||
["<Leader>gf"] = { "<cmd>Telescope git_files<cr>", desc = "Find git files with Telescope" },
|
||||
["<Leader>fq"] = { "<cmd>Telescope quickfix<cr>", desc = "Find quickfixes with Telescope" },
|
||||
["<Leader>fs"] = { "<cmd>Telescope spell_suggest<cr>", desc = "Find spell suggestions with Telescope" },
|
||||
["<Leader>fp"] = { "<cmd>Telescope projects<cr>", desc = "Find projetcs with Telescope" },
|
||||
|
||||
-- My personal keybindings
|
||||
["<Leader>²"] = { name = "Personal" },
|
||||
["<Leader>²t"] = { name = "Terminals" },
|
||||
["<Leader>²tt"] = { "<cmd>TermSelect<cr>", desc = "Select a terminal" },
|
||||
["<Leader>²tg"] = { "<cmd>terminal tig<cr>", desc = "Open tig in a new tab" },
|
||||
|
||||
["<Leader>²n"] = { name = "Neotree" },
|
||||
["<Leader>²nb"] = { "<cmd>Neotree toggle buffers left<cr>", desc = "Open Neotree Buffers" },
|
||||
["<Leader>²ng"] = { "<cmd>Neotree toggle git_status left<cr>", desc = "Open Neotree Git status" },
|
||||
|
||||
-- ["<F1>"] = { "<cmd>Telescope help_tags<cr>", desc = "Find help with Telescope" },
|
||||
["<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" }, -- 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
|
||||
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" }, -- 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
|
||||
},
|
||||
|
||||
-- Terminal mode
|
||||
t = {
|
||||
-- setting a mapping to false will disable it
|
||||
-- ["<esc>"] = false,
|
||||
-- Switch to normal mode in terminal mode
|
||||
["<Esc><Esc><Esc>"] = { "<C-\\><C-n>" },
|
||||
-- Clear Ctrl+l so that we can use it to clear the terminal
|
||||
["<C-l>"] = false,
|
||||
["<C-h>"] = false,
|
||||
-- Clear Ctrl-J and Ctrl-K so that we can use them to navigate the terminal (for lazygit)
|
||||
["<C-j>"] = false,
|
||||
["<C-k>"] = false,
|
||||
-- My terms
|
||||
["<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
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
-- AstroCore provides a central place to modify mappings, vim options, autocommands, and more!
|
||||
-- Configuration documentation can be found with `:h astrocore`
|
||||
-- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
|
||||
-- as this provides autocomplete and documentation while editing
|
||||
|
||||
---@type LazySpec
|
||||
return {
|
||||
"AstroNvim/astroui",
|
||||
---@type AstroUIOpts
|
||||
opts = {
|
||||
-- change colorscheme
|
||||
colorscheme = "github_dark",
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
return {
|
||||
-- { "jacoborus/tender.vim", lazy = false },
|
||||
-- { "altercation/vim-colors-solarized", lazy = false },
|
||||
-- { "bluz71/vim-moonfly-colors", lazy = false },
|
||||
-- { "ray-x/aurora", lazy = false },
|
||||
-- { "rmehri01/onenord.nvim" },
|
||||
{ "joshdick/onedark.vim" },
|
||||
}
|
||||
@@ -8,8 +8,6 @@ return {
|
||||
["<space>"] = false, -- disable space until we figure out which-key disabling
|
||||
[">"] = "next_source",
|
||||
["<"] = "prev_source",
|
||||
["<tab>"] = "next_source",
|
||||
["<s-tab>"] = "prev_source",
|
||||
},
|
||||
},
|
||||
event_handlers = {
|
||||
@@ -0,0 +1,4 @@
|
||||
return {
|
||||
-- direnv
|
||||
{ "direnv/direnv.vim", lazy = false },
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
return {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = {
|
||||
"nvim-telescope/telescope-file-browser.nvim",
|
||||
"da-moon/telescope-toggleterm.nvim",
|
||||
},
|
||||
config = function(...)
|
||||
require "plugins.configs.telescope"(...)
|
||||
local telescope = require "telescope"
|
||||
telescope.load_extension "file_browser"
|
||||
telescope.load_extension "toggleterm"
|
||||
end,
|
||||
}
|
||||
+31
-29
@@ -1,32 +1,34 @@
|
||||
require("lazy").setup({
|
||||
{
|
||||
"AstroNvim/AstroNvim",
|
||||
version = "^5", -- Remove version tracking to elect for nightly AstroNvim
|
||||
import = "astronvim.plugins",
|
||||
opts = { -- AstroNvim options must be set here with the `import` key
|
||||
mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up
|
||||
maplocalleader = ",", -- This ensures the localleader key must be configured before Lazy is set up
|
||||
icons_enabled = true, -- Set to false to disable icons (if no Nerd Font is available)
|
||||
pin_plugins = nil, -- Default will pin plugins when tracking `version` of AstroNvim, set to true/false to override
|
||||
update_notifications = true, -- Enable/disable notification about running `:Lazy update` twice to update pinned plugins
|
||||
},
|
||||
},
|
||||
{ import = "community" },
|
||||
{ import = "plugins" },
|
||||
{
|
||||
"AstroNvim/AstroNvim",
|
||||
version = "^4", -- Remove version tracking to elect for nighly AstroNvim
|
||||
import = "astronvim.plugins",
|
||||
opts = { -- AstroNvim options must be set here with the `import` key
|
||||
mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up
|
||||
maplocalleader = ",", -- This ensures the localleader key must be configured before Lazy is set up
|
||||
icons_enabled = true, -- Set to false to disable icons (if no Nerd Font is available)
|
||||
pin_plugins = nil, -- Default will pin plugins when tracking `version` of AstroNvim, set to true/false to override
|
||||
update_notifications = true, -- Enable/disable notification about running `:Lazy update` twice to update pinned plugins
|
||||
},
|
||||
},
|
||||
{ import = "community" },
|
||||
{ import = "custom.community" },
|
||||
{ import = "plugins" },
|
||||
{ import = "custom.plugins" },
|
||||
} --[[@as LazySpec]], {
|
||||
-- Configure any other `lazy.nvim` configuration options here
|
||||
install = { colorscheme = { "astrotheme", "habamax" } },
|
||||
ui = { backdrop = 100 },
|
||||
performance = {
|
||||
rtp = {
|
||||
-- disable some rtp plugins, add more to your liking
|
||||
-- disabled_plugins = {
|
||||
-- "gzip",
|
||||
-- "netrwPlugin",
|
||||
-- "tarPlugin",
|
||||
-- "tohtml",
|
||||
-- "zipPlugin",
|
||||
-- },
|
||||
},
|
||||
},
|
||||
-- Configure any other `lazy.nvim` configuration options here
|
||||
install = { colorscheme = { "astrodark", "habamax" } },
|
||||
ui = { backdrop = 100 },
|
||||
performance = {
|
||||
rtp = {
|
||||
-- disable some rtp plugins, add more to your liking
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
"netrwPlugin",
|
||||
"tarPlugin",
|
||||
"tohtml",
|
||||
"zipPlugin",
|
||||
},
|
||||
},
|
||||
},
|
||||
} --[[@as LazyConfig]])
|
||||
|
||||
+14
-120
@@ -1,3 +1,5 @@
|
||||
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
|
||||
-- AstroCore provides a central place to modify mappings, vim options, autocommands, and more!
|
||||
-- Configuration documentation can be found with `:h astrocore`
|
||||
-- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
|
||||
@@ -10,10 +12,10 @@ return {
|
||||
opts = {
|
||||
-- Configure core features of AstroNvim
|
||||
features = {
|
||||
large_buf = { size = 1024 * 256, lines = 10000 }, -- set global limits for large files for disabling features like treesitter
|
||||
large_buf = { size = 1024 * 500, lines = 10000 }, -- set global limits for large files for disabling features like treesitter
|
||||
autopairs = true, -- enable autopairs at start
|
||||
cmp = true, -- enable completion at start
|
||||
diagnostics = { virtual_text = true, virtual_lines = false }, -- diagnostic settings on startup
|
||||
diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on)
|
||||
highlighturl = true, -- highlight URLs at start
|
||||
notifications = true, -- enable notifications at start
|
||||
},
|
||||
@@ -22,65 +24,12 @@ return {
|
||||
virtual_text = true,
|
||||
underline = true,
|
||||
},
|
||||
-- passed to `vim.filetype.add`
|
||||
filetypes = {
|
||||
-- see `:h vim.filetype.add` for usage
|
||||
extension = {
|
||||
foo = "fooscript",
|
||||
},
|
||||
filename = {
|
||||
[".foorc"] = "fooscript",
|
||||
},
|
||||
pattern = {
|
||||
[".*/etc/foo/.*"] = "fooscript",
|
||||
},
|
||||
},
|
||||
-- Commands
|
||||
commands = {
|
||||
CleanYamlSpaces = {
|
||||
function()
|
||||
if vim.bo.filetype == 'yaml' or vim.bo.filetype == 'yml' then
|
||||
local cursor_pos = vim.api.nvim_win_get_cursor(0)
|
||||
vim.cmd([[%s/\s\+$//e]])
|
||||
vim.api.nvim_win_set_cursor(0, cursor_pos)
|
||||
print("Espaces en fin de ligne supprimés")
|
||||
else
|
||||
print("Cette commande ne fonctionne que sur les fichiers YAML")
|
||||
end
|
||||
end,
|
||||
desc = "Nettoie les espaces en fin de ligne dans les fichiers YAML",
|
||||
},
|
||||
},
|
||||
-- Autocmd
|
||||
autocmds = {
|
||||
yaml_trailing_spaces = {
|
||||
{
|
||||
event = { "BufRead", "BufNewFile" },
|
||||
pattern = { "*.yaml", "*.yml" },
|
||||
callback = function()
|
||||
vim.fn.matchadd("TrailingWhiteSpace", "\\s\\+$")
|
||||
end,
|
||||
desc = "Surligne les espaces en fin de ligne dans les fichiers YAML",
|
||||
},
|
||||
{
|
||||
event = "BufWritePre",
|
||||
pattern = { "*.yaml", "*.yml" },
|
||||
callback = function()
|
||||
local cursor_pos = vim.api.nvim_win_get_cursor(0)
|
||||
vim.cmd([[%s/\s\+$//e]])
|
||||
vim.api.nvim_win_set_cursor(0, cursor_pos)
|
||||
end,
|
||||
desc = "Nettoie les espaces en fin de ligne avant sauvegarde",
|
||||
},
|
||||
},
|
||||
},
|
||||
-- vim options can be configured here
|
||||
options = {
|
||||
opt = { -- vim.opt.<key>
|
||||
number = true, -- sets vim.opt.number
|
||||
relativenumber = true, -- sets vim.opt.relativenumber
|
||||
number = true, -- sets vim.opt.number
|
||||
spell = false, -- sets vim.opt.spell
|
||||
spelllang = "fr", -- Set spell language to french
|
||||
signcolumn = "yes", -- sets vim.opt.signcolumn to yes
|
||||
wrap = false, -- sets vim.opt.wrap
|
||||
},
|
||||
@@ -93,27 +42,15 @@ return {
|
||||
-- Mappings can be configured through AstroCore as well.
|
||||
-- NOTE: keycodes follow the casing in the vimdocs. For example, `<Leader>` must be capitalized
|
||||
mappings = {
|
||||
|
||||
-- first key is the mode
|
||||
n = {
|
||||
|
||||
-- tables with just a `desc` key will be registered with which-key if it's installed
|
||||
-- this is useful for naming menus
|
||||
-- ["<Leader>b"] = { desc = "Buffers" },
|
||||
|
||||
-- setting a mapping to false will disable it
|
||||
-- ["<C-S>"] = false,
|
||||
|
||||
-- Visual selection of pasted text
|
||||
["gp"] = { "`[v`]", desc = "Visual selection of pasted text" },
|
||||
-- second key is the lefthand side of the map
|
||||
|
||||
-- navigate buffer tabs
|
||||
["]b"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
|
||||
["[b"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
|
||||
["[b"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
|
||||
["]b"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
|
||||
|
||||
-- mappings seen under group name "Buffer"
|
||||
["<Leader>b"] = { desc = "Buffers" },
|
||||
["<Leader>bn"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
|
||||
["<Leader>bp"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
|
||||
["<Leader>bd"] = {
|
||||
function()
|
||||
require("astroui.status.heirline").buffer_picker(
|
||||
@@ -122,56 +59,13 @@ return {
|
||||
end,
|
||||
desc = "Close buffer from tabline",
|
||||
},
|
||||
["<Leader>bp"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
|
||||
["<Leader>bn"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
|
||||
|
||||
-- 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",
|
||||
},
|
||||
},
|
||||
-- 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",
|
||||
},
|
||||
["<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
|
||||
-- tables with just a `desc` key will be registered with which-key if it's installed
|
||||
-- this is useful for naming menus
|
||||
-- ["<Leader>b"] = { desc = "Buffers" },
|
||||
|
||||
-- Terminal mode : Custom mappings
|
||||
t = {
|
||||
-- Switch to normal mode in terminal mode
|
||||
["<Esc><Esc><Esc>"] = { "<C-\\><C-n>" },
|
||||
-- Clear Ctrl+l so that we can use it to clear the terminal
|
||||
["<C-l>"] = false,
|
||||
["<C-h>"] = false,
|
||||
-- Clear Ctrl-J and Ctrl-K so that we can use them for apps running in the terminal (for example lazygit)
|
||||
["<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
|
||||
-- setting a mapping to false will disable it
|
||||
-- ["<C-S>"] = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -12,6 +12,7 @@ return {
|
||||
opts = {
|
||||
-- Configuration table of features provided by AstroLSP
|
||||
features = {
|
||||
autoformat = true, -- enable or disable auto formatting on start
|
||||
codelens = true, -- enable/disable codelens refresh on start
|
||||
inlay_hints = false, -- enable/disable inlay hints on start
|
||||
semantic_tokens = true, -- enable/disable semantic token highlighting
|
||||
@@ -90,7 +91,7 @@ return {
|
||||
function() require("astrolsp.toggles").buffer_semantic_tokens() end,
|
||||
desc = "Toggle LSP semantic highlight (buffer)",
|
||||
cond = function(client)
|
||||
return client.supports_method "textDocument/semanticTokens/full" and vim.lsp.semantic_tokens ~= nil
|
||||
return client.supports_method "textDocument/semanticTokens/full" and vim.lsp.semantic_tokens
|
||||
end,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
|
||||
-- AstroUI provides the basis for configuring the AstroNvim User Interface
|
||||
-- Configuration documentation can be found with `:h astroui`
|
||||
@@ -16,7 +16,6 @@ return {
|
||||
highlights = {
|
||||
init = { -- this table overrides highlights in all themes
|
||||
-- Normal = { bg = "#000000" },
|
||||
TrailingWhiteSpace = { bg = "red" },
|
||||
},
|
||||
astrodark = { -- a table of overrides/changes when applying the astrotheme theme
|
||||
-- Normal = { bg = "#000000" },
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
|
||||
return {
|
||||
{
|
||||
-- The improved vscode terminal for Neovim written in pure lua
|
||||
"CRAG666/betterTerm.nvim",
|
||||
opts = {
|
||||
prefix = "betterTerm ",
|
||||
position = "bot",
|
||||
size = 25,
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
mode = { 'n', 't' },
|
||||
'<leader>t&',
|
||||
function()
|
||||
require('betterTerm').open(1)
|
||||
end,
|
||||
desc = 'Open betterTerm 1',
|
||||
},
|
||||
{
|
||||
mode = { 'n', 't' },
|
||||
'<leader>té',
|
||||
function()
|
||||
require('betterTerm').open(2)
|
||||
end,
|
||||
desc = 'Open betterTerm 2',
|
||||
},
|
||||
{
|
||||
'<leader>tS',
|
||||
function()
|
||||
require('betterTerm').select()
|
||||
end,
|
||||
desc = 'Select a betterTerm terminal',
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -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,63 +0,0 @@
|
||||
return {
|
||||
{
|
||||
-- Incline is a plugin for creating lightweight floating statuslines.
|
||||
-- It works great with Neovim's global statusline (:set laststatus=3)
|
||||
'b0o/incline.nvim',
|
||||
config = function()
|
||||
local devicons = require 'nvim-web-devicons'
|
||||
require('incline').setup {
|
||||
render = function(props)
|
||||
local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
|
||||
if filename == '' then
|
||||
filename = '[No Name]'
|
||||
end
|
||||
local ft_icon, ft_color = devicons.get_icon_color(filename)
|
||||
|
||||
local function get_git_diff()
|
||||
local icons = { removed = '', changed = '', added = '' }
|
||||
local signs = vim.b[props.buf].gitsigns_status_dict
|
||||
local labels = {}
|
||||
if signs == nil then
|
||||
return labels
|
||||
end
|
||||
for name, icon in pairs(icons) do
|
||||
if tonumber(signs[name]) and signs[name] > 0 then
|
||||
table.insert(labels, { icon .. signs[name] .. ' ', group = 'Diff' .. name })
|
||||
end
|
||||
end
|
||||
if #labels > 0 then
|
||||
table.insert(labels, { '┊ ' })
|
||||
end
|
||||
return labels
|
||||
end
|
||||
|
||||
local function get_diagnostic_label()
|
||||
local icons = { error = '', warn = '', info = '', hint = '' }
|
||||
local label = {}
|
||||
|
||||
for severity, icon in pairs(icons) do
|
||||
local n = #vim.diagnostic.get(props.buf, { severity = vim.diagnostic.severity[string.upper(severity)] })
|
||||
if n > 0 then
|
||||
table.insert(label, { icon .. n .. ' ', group = 'DiagnosticSign' .. severity })
|
||||
end
|
||||
end
|
||||
if #label > 0 then
|
||||
table.insert(label, { '┊ ' })
|
||||
end
|
||||
return label
|
||||
end
|
||||
|
||||
return {
|
||||
{ get_diagnostic_label() },
|
||||
{ get_git_diff() },
|
||||
{ (ft_icon or '') .. ' ', guifg = ft_color, guibg = 'none' },
|
||||
{ filename .. ' ', gui = vim.bo[props.buf].modified and 'bold,italic' or 'bold' },
|
||||
{ '┊ ' .. vim.api.nvim_win_get_number(props.win), group = 'DevIconWindows' },
|
||||
}
|
||||
end,
|
||||
}
|
||||
end,
|
||||
-- Optional: Lazy load Incline
|
||||
event = 'VeryLazy',
|
||||
},
|
||||
}
|
||||
+33
-19
@@ -1,28 +1,42 @@
|
||||
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
|
||||
-- Customize Mason
|
||||
-- Customize Mason plugins
|
||||
|
||||
---@type LazySpec
|
||||
return {
|
||||
-- use mason-tool-installer for automatically installing Mason packages
|
||||
-- use mason-lspconfig to configure LSP installations
|
||||
{
|
||||
"WhoIsSethDaniel/mason-tool-installer.nvim",
|
||||
-- overrides `require("mason-tool-installer").setup(...)`
|
||||
opts = {
|
||||
-- Make sure to use the names found in `:Mason`
|
||||
ensure_installed = {
|
||||
-- install language servers
|
||||
"lua-language-server",
|
||||
|
||||
-- install formatters
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
-- overrides `require("mason-lspconfig").setup(...)`
|
||||
opts = function(_, opts)
|
||||
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||
"lua_ls",
|
||||
-- add more arguments for adding more language servers
|
||||
})
|
||||
end,
|
||||
},
|
||||
-- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
|
||||
{
|
||||
"jay-babu/mason-null-ls.nvim",
|
||||
-- overrides `require("mason-null-ls").setup(...)`
|
||||
opts = function(_, opts)
|
||||
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||
"stylua",
|
||||
|
||||
-- install debuggers
|
||||
"debugpy",
|
||||
|
||||
-- install any other package
|
||||
"tree-sitter-cli",
|
||||
},
|
||||
},
|
||||
-- add more arguments for adding more null-ls sources
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"jay-babu/mason-nvim-dap.nvim",
|
||||
-- overrides `require("mason-nvim-dap").setup(...)`
|
||||
opts = function(_, opts)
|
||||
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||
"python",
|
||||
-- add more arguments for adding more debuggers
|
||||
})
|
||||
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,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
}
|
||||
@@ -5,20 +5,18 @@ if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
---@type LazySpec
|
||||
return {
|
||||
"nvimtools/none-ls.nvim",
|
||||
opts = function(_, opts)
|
||||
-- opts variable is the default configuration table for the setup function call
|
||||
opts = function(_, config)
|
||||
-- config variable is the default configuration table for the setup function call
|
||||
-- local null_ls = require "null-ls"
|
||||
|
||||
-- Check supported formatters and linters
|
||||
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
|
||||
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
|
||||
|
||||
-- Only insert new sources, do not replace the existing ones
|
||||
-- (If you wish to replace, use `opts.sources = {}` instead of the `list_insert_unique` function)
|
||||
opts.sources = require("astrocore").list_insert_unique(opts.sources, {
|
||||
config.sources = {
|
||||
-- Set a formatter
|
||||
-- null_ls.builtins.formatting.stylua,
|
||||
-- null_ls.builtins.formatting.prettier,
|
||||
})
|
||||
}
|
||||
return config -- return final config table
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
return {
|
||||
{ "tpope/vim-surround", event = "User AstroFile" },
|
||||
{ "tpope/vim-speeddating", event = "User AstroFile" },
|
||||
{ "tpope/vim-repeat", event = "User AstroFile" },
|
||||
-- { "tpope/vim-fugitive", event = "User AstroFile" },
|
||||
}
|
||||
@@ -5,11 +5,12 @@ if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
---@type LazySpec
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
opts = function(_, opts)
|
||||
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||
"lua",
|
||||
"vim",
|
||||
-- add more arguments for adding more treesitter parsers
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
+19
-22
@@ -1,7 +1,6 @@
|
||||
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||
|
||||
-- You can also add or configure plugins by creating files in this `plugins/` folder
|
||||
-- PLEASE REMOVE THE EXAMPLES YOU HAVE NO INTEREST IN BEFORE ENABLING THIS FILE
|
||||
-- Here are some examples:
|
||||
|
||||
---@type LazySpec
|
||||
@@ -18,28 +17,26 @@ return {
|
||||
|
||||
-- == Examples of Overriding Plugins ==
|
||||
|
||||
-- customize dashboard options
|
||||
-- customize alpha options
|
||||
{
|
||||
"folke/snacks.nvim",
|
||||
opts = {
|
||||
dashboard = {
|
||||
preset = {
|
||||
header = table.concat({
|
||||
" █████ ███████ ████████ ██████ ██████ ",
|
||||
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||
"███████ ███████ ██ ██████ ██ ██",
|
||||
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||
"██ ██ ███████ ██ ██ ██ ██████ ",
|
||||
"",
|
||||
"███ ██ ██ ██ ██ ███ ███",
|
||||
"████ ██ ██ ██ ██ ████ ████",
|
||||
"██ ██ ██ ██ ██ ██ ██ ████ ██",
|
||||
"██ ██ ██ ██ ██ ██ ██ ██ ██",
|
||||
"██ ████ ████ ██ ██ ██",
|
||||
}, "\n"),
|
||||
},
|
||||
},
|
||||
},
|
||||
"goolord/alpha-nvim",
|
||||
opts = function(_, opts)
|
||||
-- customize the dashboard header
|
||||
opts.section.header.val = {
|
||||
" █████ ███████ ████████ ██████ ██████",
|
||||
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||
"███████ ███████ ██ ██████ ██ ██",
|
||||
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||
"██ ██ ███████ ██ ██ ██ ██████",
|
||||
" ",
|
||||
" ███ ██ ██ ██ ██ ███ ███",
|
||||
" ████ ██ ██ ██ ██ ████ ████",
|
||||
" ██ ██ ██ ██ ██ ██ ██ ████ ██",
|
||||
" ██ ██ ██ ██ ██ ██ ██ ██ ██",
|
||||
" ██ ████ ████ ██ ██ ██",
|
||||
}
|
||||
return opts
|
||||
end,
|
||||
},
|
||||
|
||||
-- You can disable default plugins as follows:
|
||||
|
||||
+17
-9
@@ -1,11 +1,19 @@
|
||||
-- This will run last in the setup process.
|
||||
-- This is just pure lua so anything that doesn't
|
||||
-- This will run last in the setup process and is a good place to configure
|
||||
-- things like custom filetypes. This just pure lua so anything that doesn't
|
||||
-- fit in the normal config locations above can go here
|
||||
|
||||
-- Needed for python3 through mise
|
||||
-- Locate python3 using PATH
|
||||
local python_path = vim.fn.exepath "python3"
|
||||
if python_path == nil or python_path == "" then
|
||||
else
|
||||
vim.g.python3_host_prog = python_path
|
||||
end
|
||||
-- Set up custom autocmds
|
||||
require("custom.autocmds")
|
||||
|
||||
-- Set up custom filetypes
|
||||
require("custom.filetypes")
|
||||
|
||||
--- Remove some mappings in terminal mode
|
||||
--- that should have been set by other plugins
|
||||
--- but that are very annoying
|
||||
--- (maybe related to the smart-splits plugin)
|
||||
vim.keymap.del("t", "<C-l>") -- INFO: Clear the terminal
|
||||
vim.keymap.del("t", "<C-j>") -- INFO: Move a commit up/down in LazyGit
|
||||
vim.keymap.del("t", "<C-k>") -- INFO: Move a commit up/down in LazyGit
|
||||
|
||||
vim.cmd("colorscheme tokyonight")
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
HelmRelease
|
||||
filebeat
|
||||
daemonset
|
||||
Binary file not shown.
+6
-31
@@ -1,34 +1,9 @@
|
||||
Vault
|
||||
|
||||
Docker
|
||||
docker
|
||||
Dockerfile
|
||||
|
||||
Kubernetes
|
||||
kubernetes
|
||||
Helm
|
||||
helm
|
||||
Helmchart
|
||||
helmchart
|
||||
Chart
|
||||
chart
|
||||
kubectl
|
||||
k9s
|
||||
|
||||
Beats
|
||||
beats
|
||||
filebeat
|
||||
metricbeat
|
||||
|
||||
Kafka
|
||||
kafka
|
||||
password
|
||||
topics
|
||||
|
||||
Jenkins
|
||||
Jenkinsfile
|
||||
jenkinsfile
|
||||
|
||||
Angular
|
||||
Spring
|
||||
Drupal
|
||||
Vault
|
||||
Jenkinsfile
|
||||
Dockerfile
|
||||
jenkinsfile
|
||||
Jenkins
|
||||
Kubernetes
|
||||
|
||||
Reference in New Issue
Block a user