Compare commits

..

2 commits
main ... merlin

Author SHA1 Message Date
62de48f015
Update init.lua 2022-10-30 00:22:23 +02:00
253abf37b3
Merge pull request #1 from jiriks74/main
Update with main
2022-10-30 00:07:32 +02:00
8 changed files with 360 additions and 765 deletions

View file

@ -1,111 +0,0 @@
name: Issue report
description: Report any errors, bugs, or unexpected behaviors related to presence.nvim
title: "[Bug]: "
labels: [bug]
assignees:
- jiriks74
body:
- type: markdown
attributes:
value: |
Before reporting, please search [existing issues](https://gitea.stefka.eu/jiriks74/astronvim_config/issues/) and make sure that you are on the latest commit
- type: dropdown
attributes:
label: "Are you on the latest version of the commit?"
description: "If no, please backup your current config and update."
options:
- "Yes"
- "No"
validations:
required: true
- type: input
attributes:
label: "Which commit are you on?"
description: "To thet the commit hash run `git rev-parse --short HEAD` in the config directory (`~/.config/nvim/lua/user`)"
validations:
required: true
- type: dropdown
attributes:
label: "Have you modified the config?"
description: "If so, backup your current config and try the default one before reporting."
options:
- "Yes"
- "No"
validations:
required: true
- type: textarea
attributes:
label: "Description"
description: "A short summary of the error, bug, or unexpected behavior you're facing."
validations:
required: true
- type: textarea
attributes:
label: "Neovim version"
description: "Output of `nvim --version`"
render: markdown
placeholder: |
NVIM: v0.6.0-dev+209-g0603eba6e
Build type: Release
LuaJIT: 2.1.0-beta3
value: |
NVIM:
Build type:
LuaJIT:
validations:
required: true
- type: input
attributes:
label: "OS information"
placeholder: "Ubuntu 22.04"
validations:
required: true
- type: textarea
attributes:
label: "Steps to reproduce"
description: "Steps to reproduce the issue with your config(s) if applicable."
placeholder: |
1. Setup presence.nvim with `require("presence"):setup({...})`
2. Run Neovim with `nvim test.txt`
3. ...
validations:
required: true
- type: textarea
attributes:
label: "Logs"
description: "The full list of `:messages` from one or more `nvim` instances.\nPlease insert the logs into code blocks."
placeholder: |
<details>
```
[presence.nvim] Using runtime path: /run/user/1000
[presence.nvim] Using Discord IPC socket path: /run/user/1000/discord-ipc-0
[presence.nvim] Checking Discord IPC socket at /run/user/1000/discord-ipc-0...
```
</details>
value: |
<details>
```
```
</details>
validations:
required: true
- type: textarea
attributes:
label: "Aditional info"
description: "If you'd like to add anything else put it here."
validations:
required: false

View file

@ -1,34 +0,0 @@
name: Feature request
description: Report any errors, bugs, or unexpected behaviors related to presence.nvim
title: "[FEAT]: "
labels: [enhancement]
assignees:
- jiriks74
body:
- type: textarea
attributes:
label: Is your feature request related to a problem?
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when...
validations:
required: true
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
validations:
required: false
- type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
validations:
required: false

View file

@ -1,16 +0,0 @@
name: Luacheck
on: [push, pull_request]
jobs:
Luacheck:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Luacheck
run: |
apt update && apt install lua-check -y
- name: Luacheck linter
run: |
luacheck .

View file

@ -1,12 +0,0 @@
name: StyLua
on: [push, pull_request]
jobs:
StyLuacheck:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: StyLua check
run: |
npx @johnnymorganz/stylua-bin .

View file

@ -1,9 +0,0 @@
std = {
globals = {
"vim",
"require",
},
read_globals = {
"fallback",
},
}

View file

@ -1,8 +1,6 @@
# My [AstroNvim](https://github.com/AstroNvim/AstroNvim) config # My [AstroNvim](https://github.com/AstroNvim/AstroNvim) config
## README for the merlin server at FIT VUT can be found [here](https://github.com/jiriks74/astronvim_config/tree/merlin) ## How to install my config on merli
## How to install my config
- First you have to install AstroNvim - First you have to install AstroNvim
- Backup your previous nvim config - Backup your previous nvim config
@ -15,23 +13,65 @@
```bash ```bash
git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
nvim +PackerSync
``` ```
- Clone my config into `~/.config/nvim/lua/user` - Clone my config into `~/.config/nvim/lua/user`
- For NeoVim >= 8.0
```bash ```bash
git clone https://github.com/jiriks74/astronvim_config ~/.config/nvim/lua/user git clone https://github.com/jiriks74/astronvim_config ~/.config/nvim/lua/user
``` ```
- Open nvim and run `:PackerSync`
- **This will result in errors as `merlin` kills most of the clone processes**
- To make this work you need to press `R` (yes, capital) to download all the
failed downloads
- You have to do this until all plugins have been successfully downloaded
```bash
nvim +PackerSync
```
## Updating
```bash
cd ~/.config/nvim
git pull
cd lua/user
git pull
```
- To update the plugins you need to first remove all the downloaded plugins
(or plugin downloading will fail)
```bash
rm -rf ~/.local/share/nvim
```
- Then you need to repeat the process as if you were initializing AstroNvim for
the first time:
- Open nvim and run `:PackerSync`
- **This will result in errors as `merlin` kills most of the clone processes**
- To make this work you need to press `R` (yes, capital) to download all the
failed downloads
- You have to do this until all plugins have been successfully downloaded
```bash
nvim +PackerSync
```
## Useful info ## Useful info
- Folding with treesitter - Folding with treesitter
- To get folding for your language, you need to run - To get folding for your language, you need to run
`:TSInstall <language>` (eg. `TSInstall cpp` to get C++ folding) `:TSInstall <language>` (eg. `TSInstall cpp` to get C++ folding)
- Install language servers - Install language servers
- Use `Space+p+m` keybind to open install menu. - Use `Space+p+I` keybind to open install menu.
- To install package under the cursor, press `i` - To install package under the cursor, press `i`
- To uninstall package under the cursor press `X` - To uninstall package under the cursor press `X`
- Debugging
- See `vimspector` under [`Extra plugin included`](#extra-plugins-included)
- LaTeX - LaTeX
- To use `vimtex` plugin, you need to have LaTeX installed - To use `vimtex` plugin, you need to have LaTeX installed
- [`texlive-most`](https://wiki.archlinux.org/title/TeX_Live#Installation) package on ArchLinux - [`texlive-most`](https://wiki.archlinux.org/title/TeX_Live#Installation) package on ArchLinux
@ -43,6 +83,14 @@
## Extra plugins included ## Extra plugins included
- [vimspector](https://github.com/puremourning/vimspector)
- Simple plugin for debugging
- You need have to have `neovim` python module installed
```bash
pip3 install neovim
```
- You have to create a file with `Launch` config - see the [plugin repository](https://github.com/puremourning/vimspector) - You have to create a file with `Launch` config - see the [plugin repository](https://github.com/puremourning/vimspector)
- [vim-pio](https://github.com/jiriks74/vim-pio) - [vim-pio](https://github.com/jiriks74/vim-pio)
- PlatformIO vim plugin - PlatformIO vim plugin
@ -70,6 +118,37 @@
| CTRL+e | ["\<C-e\>"] | Copilot accept | | CTRL+e | ["\<C-e\>"] | Copilot accept |
| CTRL+s | ["\<C-s\>"] | Toggle autosave | | CTRL+s | ["\<C-s\>"] | Toggle autosave |
### Mappings for vimspector (debugging)
| Shortcut | Vim keybind | Description |
|-------------|-------------------|--------------------|
| Space+d+d | ["\<leader\>dd"] | Launch |
| Space+d+S | ["\<leader\>dS"] | Stop |
| Space+d+c | ["\<leader\>dc"] | Continue |
| Space+d+p | ["\<leader\>dp"] | Pause |
| Space+d+e | ["\<leader\>de"] | Reset |
| Space+d+r | ["\<leader\>dr"] | Restart |
| Space+d+R | ["\<leader\>dR"] | Run to cursor |
| Space+d+C | ["\<leader\>dC"] | Go to current line |
| Space+d+P | ["\<leader\>dP"] | Move cursor to the program counter in current frame |
| | Breakpoints | |
| Space+d+b+t | ["\<leader\>dbt"] | Toggle breakpoint |
| Space+d+b+l | ["\<leader\>dbl"] | List breakpoints |
| Space+d+b+c | ["\<leader\>dbc"] | Clear breakpoints |
| Space+d+b+C | ["\<leader\>dbC"] | Toggle CBreakpoint or LogPoint on current line |
| Space+d+b+f | ["\<leader\>dbf"] | Add a function breakpoint for expression under cursor |
| Space+d+b+n | ["\<leader\>dbn"] | Jump to next breakpoint |
| Space+d+b+p | ["\<leader\>dbp"] | Jump to previous breakpoint |
| | Step keybinds | |
| Space+d+s+s | ["\<leader\>dss"] | Step over |
| Space+d+s+i | ["\<leader\>dsi"] | Step into |
| Space+d+s+o | ["\<leader\>dso"] | Step out |
| | Frame keybinds | |
| Space+d+f+u | ["\<leader\>dfu"] | Up frame |
| Space+d+f+d | ["\<leader\>dfd"] | Down frame |
There are also some [VSCode like keybinds setup by the plugin](https://github.com/puremourning/vimspector#visual-studio--vscode)
### Mappings for markdown preview ### Mappings for markdown preview
| Shortcut | Vim keybind | Description | | Shortcut | Vim keybind | Description |
@ -82,8 +161,6 @@
## TODO ## TODO
- [ ] Nvim-DAP
- Modified the default AstroNvim config
- [ ] [Mappings for `vimtex`](#mappings-for-vimtex) - [ ] [Mappings for `vimtex`](#mappings-for-vimtex)
- [ ] Better section for `vim-pio` - [ ] Better section for `vim-pio`
- [ ] Add section for setting up debugging - [ ] Add section for setting up debugging
@ -93,6 +170,7 @@
- [ ] Better [`README.md`](https://github.com/jiriks74/astronvim_config/blob/neovim7.2/README.md) - [ ] Better [`README.md`](https://github.com/jiriks74/astronvim_config/blob/neovim7.2/README.md)
for [`neovim7.2`](https://github.com/jiriks74/astronvim_config/tree/neovim7.2) branch for [`neovim7.2`](https://github.com/jiriks74/astronvim_config/tree/neovim7.2) branch
- [ ] Add section redirecting to [`neovim72`](https://github.com/jiriks74/astronvim_config/tree/neovim7.2) - [ ] Add section redirecting to [`neovim72`](https://github.com/jiriks74/astronvim_config/tree/neovim7.2)
branch's [`README.md`](https://github.com/jiriks74/astronvim_config/blob/neovim7.2/README.md) if user has Neovim < 8.0 branch's [`README.md`](https://github.com/jiriks74/astronvim_config/blob/neovim7.2/README.md) it user has Neovim < 8.0
- [ ] Add `.vimspector.json` template
- [ ] Setting up simple wiki? - [ ] Setting up simple wiki?
- [ ] Add section for ["weirongxu/plantuml-previewer.vim"](https://github.com/weirongxu/plantuml-previewer.vim) - [ ] Add section for ["weirongxu/plantuml-previewer.vim"](https://github.com/weirongxu/plantuml-previewer.vim)

774
init.lua
View file

@ -1,16 +1,15 @@
local cmp = require('cmp')
-- AstroNvim Configuration Table -- AstroNvim Configuration Table
-- All configuration changes should go inside of the table below -- All configuration changes should go inside of the table below
-- A split up user configuration example can be found at: https://github.com/AstroNvim/split_user_example
-- You can think of a Lua "table" as a dictionary like data structure the -- You can think of a Lua "table" as a dictionary like data structure the
-- normal format is "key = value". These also handle array like data structures -- normal format is "key = value". These also handle array like data structures
-- where a value with no key simply has an implicit numeric key -- where a value with no key simply has an implicit numeric key
local config = { local config = {
-- Configure AstroNvim updates -- Configure AstroNvim updates
updater = { updater = {
remote = "origin", -- remote to use remote = "origin", -- remote to use
-- channel = "nightly", -- "stable" or "nightly"
channel = "nightly", -- "stable" or "nightly" channel = "nightly", -- "stable" or "nightly"
version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY) version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY)
branch = "nightly", -- branch name (NIGHTLY ONLY) branch = "nightly", -- branch name (NIGHTLY ONLY)
@ -18,6 +17,7 @@ local config = {
pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only) pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only)
skip_prompts = false, -- skip prompts about breaking changes skip_prompts = false, -- skip prompts about breaking changes
show_changelog = true, -- show the changelog after performing an update show_changelog = true, -- show the changelog after performing an update
auto_reload = false, -- automatically reload and sync packer after a successful update
auto_quit = false, -- automatically quit the current session after a successful update auto_quit = false, -- automatically quit the current session after a successful update
-- remotes = { -- easily add new remotes to track -- remotes = { -- easily add new remotes to track
-- ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url -- ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url
@ -25,9 +25,10 @@ local config = {
-- ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork -- ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork
-- }, -- },
}, },
-- Set colorscheme to use -- Set colorscheme to use
-- colorscheme = "astrodark", colorscheme = "default_theme",
colorscheme = "tokyonight-night",
-- Add highlight groups in any theme -- Add highlight groups in any theme
highlights = { highlights = {
-- init = { -- this table overrides highlights in all themes -- init = { -- this table overrides highlights in all themes
@ -37,6 +38,7 @@ local config = {
-- Normal = { bg = "#000000" }, -- Normal = { bg = "#000000" },
-- }, -- },
}, },
-- set vim options here (vim.<first_key>.<second_key> = value) -- set vim options here (vim.<first_key>.<second_key> = value)
options = { options = {
opt = { opt = {
@ -48,28 +50,16 @@ local config = {
wrap = false, -- sets vim.opt.wrap wrap = false, -- sets vim.opt.wrap
}, },
g = { g = {
-- sets vim.g.mapleader mapleader = " ", -- sets vim.g.mapleader
mapleader = " ", cmp_enabled = true, -- enable completion at start
-- enable or disable auto formatting at start (lsp.formatting.format_on_save must be enabled) autopairs_enabled = true, -- enable autopairs at start
autoformat_enabled = true, diagnostics_enabled = true, -- enable diagnostics at start
-- enable completion at start status_diagnostics_enabled = true, -- enable diagnostics in statusline
cmp_enabled = true,
-- enable autopairs at start
autopairs_enabled = true,
-- set the visibility of diagnostics in the UI (0=off, 1=only show in status line, 2=virtual text off, 3=all on)
diagnostics_mode = 3,
-- disable icons in the UI (disable if no nerd font is available, requires :PackerSync after changing)
icons_enabled = true,
-- disable notifications when toggling UI elements
ui_notifications_enabled = true,
-- Taglist
Tlist_Use_Right_Window = 1,
Tlist_GainFocus_On_ToggleOpen = 1,
Tlist_Auto_Update = 1,
-- Tlist_Close_On_Select = 1,
-- MarkdownPreview copilot_no_tab_map = true,
mkdp_auto_close = 0, copilot_assume_mapped = true,
copilot_tab_fallback = "",
vimspector_enable_mappings = 'VISUAL_STUDIO',
}, },
}, },
-- If you need more control, you can use the function()...end notation -- If you need more control, you can use the function()...end notation
@ -82,31 +72,81 @@ local config = {
-- return local_vim -- return local_vim
-- end, -- end,
-- Set dashboard header
header = {
" █████ ███████ ████████ ██████ ██████",
"██ ██ ██ ██ ██ ██ ██ ██",
"███████ ███████ ██ ██████ ██ ██",
"██ ██ ██ ██ ██ ██ ██ ██",
"██ ██ ███████ ██ ██ ██ ██████",
" ",
" ███  ██ ██  ██ ██ ███  ███",
" ████  ██ ██  ██ ██ ████  ████",
" ██ ██  ██ ██  ██ ██ ██ ████ ██",
" ██  ██ ██  ██  ██  ██ ██  ██  ██",
" ██   ████   ████   ██ ██  ██",
},
-- Default theme configuration
default_theme = {
-- Modify the color palette for the default theme
colors = {
fg = "#abb2bf",
bg = "#1e222a",
},
highlights = function(hl) -- or a function that returns a new table of colors to set
local C = require "default_theme.colors"
hl.Normal = { fg = C.fg, bg = C.bg }
-- New approach instead of diagnostic_style
hl.DiagnosticError.italic = true
hl.DiagnosticHint.italic = true
hl.DiagnosticInfo.italic = true
hl.DiagnosticWarn.italic = true
return hl
end,
-- enable or disable highlighting for extra plugins
plugins = {
aerial = true,
beacon = false,
bufferline = true,
dashboard = true,
highlighturl = true,
hop = false,
indent_blankline = true,
lightspeed = false,
["neo-tree"] = true,
notify = true,
["nvim-tree"] = false,
["nvim-web-devicons"] = true,
rainbow = true,
symbols_outline = false,
telescope = true,
vimwiki = false,
["which-key"] = true,
},
},
-- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on -- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on
diagnostics = { diagnostics = {
virtual_text = true,
underline = true, underline = true,
}, },
-- Extend LSP configuration -- Extend LSP configuration
lsp = { lsp = {
-- enable servers that you already have installed without mason -- enable servers that you already have installed without mason
servers = { servers = {
-- "pyright" -- "pyright"
"clangd"
}, },
formatting = { formatting = {
-- control auto formatting on save format_on_save = false, -- enable or disable auto formatting on save
format_on_save = { disabled = { -- disable formatting capabilities for the listed clients
enabled = false, -- enable or disable format on save globally -- "sumneko_lua",
allow_filetypes = { -- enable format on save for specified filetypes only
-- "go",
}, },
ignore_filetypes = { -- disable format on save for specified filetypes
-- "python",
},
},
disabled = { -- disable formatting capabilities for the listed language servers
-- "lua_ls",
},
timeout_ms = 1000, -- default format timeout
-- filter = function(client) -- fully override the default formatting function -- filter = function(client) -- fully override the default formatting function
-- return true -- return true
-- end -- end
@ -121,19 +161,13 @@ local config = {
-- on_attach = function(client, bufnr) -- on_attach = function(client, bufnr)
-- end, -- end,
-- override the LSP setup handler function based on server name -- override the mason server-registration function
-- setup_handlers = { -- server_registration = function(server, opts)
-- -- first function changes the default setup handler -- require("lspconfig")[server].setup(opts)
-- function(server, opts) require("lspconfig")[server].setup(opts) end,
-- -- keys for a specific server name will be used for that LSP
-- lua_ls = function(server, opts)
-- -- custom lua_ls setup handler
-- require("lspconfig")["lua_ls"].setup(opts)
-- end, -- end,
-- },
-- Add overrides for LSP server settings, the keys are the name of the server -- Add overrides for LSP server settings, the keys are the name of the server
config = { ["server-settings"] = {
-- example for addings schemas to yamlls -- example for addings schemas to yamlls
-- yamlls = { -- override table for require("lspconfig").yamlls.setup({...}) -- yamlls = { -- override table for require("lspconfig").yamlls.setup({...})
-- settings = { -- settings = {
@ -148,9 +182,10 @@ local config = {
-- }, -- },
clangd = { clangd = {
capabilities = { offsetEncoding = "utf-8" }, capabilities = { offsetEncoding = "utf-8" },
}
}, },
}, },
},
-- Mapping data with "desc" stored directly by vim.keymap.set(). -- Mapping data with "desc" stored directly by vim.keymap.set().
-- --
-- Please use this mappings table to set keyboard mapping since this is the -- Please use this mappings table to set keyboard mapping since this is the
@ -159,60 +194,51 @@ local config = {
mappings = { mappings = {
-- first key is the mode -- first key is the mode
n = { n = {
["<leader>fT"] = {
function() require("telescope.builtin").colorscheme { enable_preview = true } end,
desc = "Find themes",
},
-- second key is the lefthand side of the map -- second key is the lefthand side of the map
-- mappings seen under group name "Buffer" -- mappings seen under group name "Buffer"
["<leader>bb"] = { "<cmd>tabnew<cr>", desc = "New tab" }, ["<leader>bb"] = { "<cmd>tabnew<cr>", desc = "New tab" },
["<leader>bc"] = { "<cmd>BufferLinePickClose<cr>", desc = "Pick to close" }, ["<leader>bc"] = { "<cmd>BufferLinePickClose<cr>", desc = "Pick to close" },
["<leader>bj"] = { "<cmd>BufferLinePick<cr>", desc = "Pick to jump" }, ["<leader>bj"] = { "<cmd>BufferLinePick<cr>", desc = "Pick to jump" },
["<leader>bt"] = { "<cmd>BufferLineSortByTabs<cr>", desc = "Sort by tabs" }, ["<leader>bt"] = { "<cmd>BufferLineSortByTabs<cr>", desc = "Sort by tabs" },
-- tables with the `name` key will be registered with which-key if it's installed ["<leader>uD"] = { "<cmd>Alpha<cr>", desc = "Alpha dashboard" },
-- this is useful for naming menus
["<leader>b"] = { name = "Buffers" }, ["<leader>dd"] = { "<cmd>call vimspector#Launch()<cr>", desc = "Launch" },
-- Trigger Alpha dashboard on close when no buffers are left ["<leader>dS"] = { "<cmd>call vimspector#Stop()<cr>", desc = "Stop" },
["<leader>c"] = { ["<leader>dc"] = { "<cmd>call vimspector#Continue()<cr>", desc = "Continue" },
function() ["<leader>dp"] = { "<cmd>call vimspector#Pause()<cr>", desc = "Pause" },
local bufs = vim.fn.getbufinfo { buflisted = true } ["<leader>de"] = { "<cmd>call vimspector#Reset()<cr>", desc = "Reset" },
require("astronvim.utils.buffer").close(0) ["<leader>dr"] = { "<cmd>call vimspector#Restart()<cr>", desc = "Restart" },
if require("astronvim.utils").is_available "alpha-nvim" and not bufs[2] then require("alpha").start(true) end ["<leader>dR"] = { "<cmd>call vimspector#RunToCursor()<cr>", desc = "Run to cursor" },
end, ["<leader>dC"] = { "<cmd>call vimspector#GoToCurrentLine()", desc = "Go to current line" },
desc = "Close buffer", ["<leader>dP"] = { "<cmd>call vimspector#JumpToProgramCounter()<cr>",
}, desc = "Move Cursor to the program counter in current frame" },
-- quick save
-- ["<C-s>"] = { ":w!<cr>", desc = "Save File" }, -- change description but the same command -- Breakpoints
["<leader>dbt"] = { "<cmd>call vimspector#ToggleBreakpoint()<cr>", desc = "Toggle breakpoint" },
["<leader>dbl"] = { "<cmd>call vimspector#ListBreakpoints()<cr>", desc = "List breakpoints" },
["<leader>dbc"] = { "<cmd>call vimspector#ClearBreakpoints()<cr>", desc = "Clear breakpoints" },
["<leader>dbC"] = { "<cmd>call vimspector#ToggleBreakpoint( { trigger expr, hit count expr } )<cr>",
desc = "Toggle CBreakpoint or LogPoint on current line" },
["<leader>dbf"] = { "<cmd>call vimspector#AddFunctionBreakpoint( '<cexpr>' )<cr>",
desc = "Add a function breakpoint for expression under cursor" },
["<leader>dbn"] = { "<cmd>call vimspector#JumpToNextBreakpoint()<cr>", desc = "Jump to next breakpoint" },
["<leader>dbp"] = { "<cmd>call vimspector#JumpToPreviousBreakpoint()<cr>", desc = "Jump to previous breakpoint" },
-- Step
["<leader>dss"] = { "<cmd>call vimspector#StepOver()<cr>", desc = "Step over" },
["<leader>dsi"] = { "<cmd>call vimspector#StepInto()<cr>", desc = "Step into" },
["<leader>dso"] = { "<cmd>call vimspector#StepOut()<cr>", desc = "Step out" },
-- Frames
["<leader>dfu"] = { "<cmd>call vimspector#UpFrame()<cr>", desc = "Up frame" },
["<leader>dfd"] = { "<cmd>call vimspector#DownFrame()<cr>", desc = "Down frame" },
-- Debugger mappings
["<leader>dl"] = { name = "Load launch.json" },
["<leader>L"] = {
"<cmd>LiveServer<cr>",
desc = " Live server",
},
-- Config loading
["<leader>dlc"] = {
function() require("dap.ext.vscode").load_launchjs(nil, { cppdbg = { "c", "cpp", "asm" } }) end,
desc = "C/C++/asm",
},
["<leader>dln"] = {
function()
require("dap.ext.vscode").load_launchjs(
nil,
{ node2 = { "javascript", "javascriptreact", "typescriptreact", "typescript" } }
)
end,
desc = "Node",
},
-- Load launch.json for all supported languages
["<leader>dla"] = { function() require("dap.ext.vscode").load_launchjs(nil, nil) end, desc = "All" },
-- Mardown preview -- Mardown preview
["<leader>m"] = { name = " Markdown" },
["<leader>mp"] = { "<cmd>MarkdownPreview<cr>", desc = "Markdown preview" }, ["<leader>mp"] = { "<cmd>MarkdownPreview<cr>", desc = "Markdown preview" },
["<leader>ms"] = { "<cmd>MarkdownPreviewStop<cr>", desc = "Markdown preview stop" }, ["<leader>ms"] = { "<cmd>MarkdownPreviewStop<cr>", desc = "Markdown preview stop" },
["<leader>mt"] = { "<cmd>MarkdownPreviewToggle<cr>", desc = "Markdown preview toggle" }, ["<leader>mt"] = { "<cmd>MarkdownPreviewToggle<cr>", desc = "Markdown preview toggle" },
-- Vimtex mappings -- Vimtex mappings
["<leader>x"] = { name = " LaTeX" },
["<leader>xi"] = { "<cmd>VimtexInfo<cr>", desc = "Info" }, ["<leader>xi"] = { "<cmd>VimtexInfo<cr>", desc = "Info" },
["<leader>xI"] = { "<cmd>VimtexInfoFull<cr>", desc = "Full info" }, ["<leader>xI"] = { "<cmd>VimtexInfoFull<cr>", desc = "Full info" },
["<leader>xt"] = { "<cmd>VimtexTocOpen<cr>", desc = "Open table of contents" }, ["<leader>xt"] = { "<cmd>VimtexTocOpen<cr>", desc = "Open table of contents" },
@ -235,404 +261,31 @@ local config = {
["<leader>xX"] = { "<cmd>VimtexReloadState<cr>", desc = "Reload the state for the current buffer" }, ["<leader>xX"] = { "<cmd>VimtexReloadState<cr>", desc = "Reload the state for the current buffer" },
["<leader>xs"] = { "<cmd>VimtexToggleMain<cr>", desc = "Set current file as 'current project'" }, ["<leader>xs"] = { "<cmd>VimtexToggleMain<cr>", desc = "Set current file as 'current project'" },
["<leader>xa"] = { "<cmd>VimtexContextMenu<cr>", desc = "Show context menu" }, ["<leader>xa"] = { "<cmd>VimtexContextMenu<cr>", desc = "Show context menu" },
-- Trouble, Taglist
["<leader>lt"] = { desc = false, name = "Trouble, Tagbar" },
-- Taglist
["<leader>ltT"] = { "<cmd>TlistToggle<cr>", desc = "Tagbar toggle" },
-- Trouble
["<leader>ltx"] = { "<cmd>TroubleToggle<cr>", desc = "Toggle Trouble" },
["<leader>ltw"] = { "<cmd>TroubleToggle workspace_diagnostics<cr>", desc = "Workspace diagnostics" },
["<leader>ltd"] = { "<cmd>TroubleToggle document_diagnostics<cr>", desc = "Document diagnostics" },
["<leader>ltq"] = { "<cmd>TroubleToggle quickfix<cr>", desc = "Quickfix" },
["<leader>ltl"] = { "<cmd>TroubleToggle loclist<cr>", desc = "Loc List" },
["<leader>ltR"] = { "<cmd>TroubleToggle lsp_references<cr>", desc = "Lsp references" },
-- ["<leader>ftt"] = { "<cmd>TodoTrouble<cr>", desc = "Todo Trouble" },
--
-- Autosave -- Autosave
["<C-s>"] = { "<cmd>ASToggle<cr>", desc = "Toggle autosave" }, ["<C-s>"] = { "<cmd>ASToggle<cr>", desc = "Toggle autosave" },
["<leader>fs"] = { "<cmd>ASToggle<cr>", desc = "Toggle autosave" },
}, -- quick save
v = { -- ["<C-s>"] = { ":w!<cr>", desc = "Save File" }, -- change description but the same command
-- Carbon code sharing
["<leader>s"] = { ":CarbonNow<CR>", desc = "Share code on Carbon", silent = true },
}, },
t = { t = {
-- setting a mapping to false will disable it -- setting a mapping to false will disable it
-- ["<esc>"] = false, -- ["<esc>"] = false,
}, },
i = {
-- ["<Tab>"] = { "copilot#Accept('<CR>')", silent = true, expr = true },
}
}, },
-- Configure require("lazy").setup() options
lazy = {
defaults = { lazy = true },
performance = {
rtp = {
-- customize default disabled vim plugins
disabled_plugins = {
"tohtml",
"gzip",
"matchit",
"zipPlugin",
"netrwPlugin",
"tarPlugin",
"matchparen",
},
},
},
},
-- Configure plugins -- Configure plugins
plugins = { plugins = {
-- Theme init = {
{
"folke/tokyonight.nvim",
event = "UIEnter",
},
-- You can disable default plugins as follows: -- You can disable default plugins as follows:
-- { "max397574/better-escape.nvim", enabled = false }, -- ["goolord/alpha-nvim"] = { disable = true },
--
-- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
-- {
-- "L3MON4D3/LuaSnip",
-- config = function(plugin, opts)
-- -- include the default astronvim config that calls the setup call
-- require "plugins.configs.luasnip"(plugin, opts)
-- -- add more custom luasnip configuration such as filetype extend or custom snippets
-- local luasnip = require "luasnip"
-- luasnip.filetype_extend("javascript", { "javascriptreact" })
-- end,
-- },
-- {
-- "windwp/nvim-autopairs",
-- config = function(plugin, opts)
-- -- include the default astronvim config that calls the setup call
-- require "plugins.configs.nvim-autopairs"(plugin, opts)
-- -- add more custom autopairs configuration such as custom rules
-- local npairs = require "nvim-autopairs"
-- local Rule = require "nvim-autopairs.rule"
-- local cond = require "nvim-autopairs.conds"
-- npairs.add_rules(
-- {
-- Rule("$", "$", { "tex", "latex" })
-- -- don't add a pair if the next character is %
-- :with_pair(cond.not_after_regex "%%")
-- -- don't add a pair if the previous character is xxx
-- :with_pair(
-- cond.not_before_regex("xxx", 3)
-- )
-- -- don't move right when repeat character
-- :with_move(cond.none())
-- -- don't delete if the next character is xx
-- :with_del(cond.not_after_regex "xx")
-- -- disable adding a newline when you press <cr>
-- :with_cr(cond.none()),
-- },
-- -- disable for .vim files, but it work for another filetypes
-- Rule("a", "a", "-vim")
-- )
-- end,
-- },
-- By adding to the which-key config and using our helper function you can add more which-key registered bindings
-- {
-- "folke/which-key.nvim",
-- config = function(plugin, opts)
-- require "plugins.configs.which-key" (plugin, opts)
-- -- Add bindings which show up as group name
-- local wk = require "which-key"
-- wk.register({
-- m = { name = "Markdown" },
-- ft = { name = "Trouble" },
-- b = { name = "Buffers" },
-- }, { mode = "n", prefix = "<leader>" })
-- end,
-- },
{
"dstein64/vim-startuptime",
cmd = "StartupTime",
},
{
-- override nvim-cmp plugin
"hrsh7th/nvim-cmp",
dependencies = {
"hrsh7th/cmp-emoji", -- add cmp source as dependency of cmp
"zbirenbaum/copilot.lua",
},
-- override the options table that is used in the `require("cmp").setup()` call
opts = function(_, opts)
-- opts parameter is the default options table
-- the function is lazy loaded so cmp is able to be required
local cmp = require "cmp"
local luasnip = require "luasnip"
-- modify the mapping part of the table
-- Disable tab completion, use CTRL + J or CTRL + K instead
opts.mapping["<CR>"] = cmp.mapping.confirm { select = false }
opts.mapping["<TAB>"] = cmp.mapping.confirm { select = false }
if luasnip.expandable() then
luasnip.expand()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
fallback()
end
opts.sources = cmp.config.sources {
-- Copilot Source
{ name = "copilot", group_index = 2 },
{ name = "nvim_lsp", priority = 1000 },
{ name = "luasnip", priority = 750 },
{ name = "buffer", priority = 500 },
{ name = "path", priority = 250 },
{ name = "emoji", priority = 700 }, -- add new source
}
return opts
end,
},
{
"onsails/lspkind.nvim",
opts = {
mode = "symbol",
symbol_map = {
-- Copilot icon
Copilot = "",
Array = "󰅪",
Boolean = "",
Class = "󰌗",
Constructor = "",
Key = "󰌆",
Namespace = "󰅪",
Null = "NULL",
Number = "#",
Object = "󰀚",
Package = "󰏗",
Property = "",
Reference = "",
Snippet = "",
String = "󰀬",
TypeParameter = "󰊄",
Unit = "",
},
menu = {},
},
enabled = vim.g.icons_enabled,
config = require "plugins.configs.lspkind",
},
-- You can also add new plugins here as well: -- You can also add new plugins here as well:
-- Add plugins, the lazy syntax -- Add plugins, the packer syntax without the "use"
-- { "andweeb/presence.nvim" },
--Social
{
"jiriks74/presence.nvim",
event = "UIEnter",
},
{
"ellisonleao/carbon-now.nvim",
cmd = "CarbonNow",
opts = {
base_url = "https://carbon.now.sh/",
open_cmd = "xdg-open",
options = {
theme = "night-owl",
window_theme = "none",
font_family = "Hack",
font_size = "18px",
bg = "none",
line_numbers = true,
line_height = "133%",
drop_shadow = false,
drop_shadow_offset_y = "20px",
drop_shadow_blur = "68px",
width = "680",
watermark = false,
},
},
},
-- Comments
{
"folke/todo-comments.nvim",
event = "User AstroFile",
opts = {
signs = true, -- show icons in the signs column
sign_priority = 8, -- sign priority
-- keywords recognized as todo comments
keywords = {
FIX = {
icon = "", -- icon used for the sign, and in search results
color = "error", -- can be a hex color, or a named color (see below)
alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords
-- signs = false, -- configure signs for some keywords individually
},
TODO = { icon = "", color = "info" },
HACK = { icon = "", color = "warning" },
WARN = { icon = "", color = "warning", alt = { "WARNING", "XXX" } },
PERF = { icon = "", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
NOTE = { icon = "", color = "hint", alt = { "INFO" } },
TEST = { icon = "", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
},
gui_style = {
fg = "NONE", -- The gui style to use for the fg highlight group.
bg = "BOLD", -- The gui style to use for the bg highlight group.
},
merge_keywords = true, -- when true, custom keywords will be merged with the defaults
-- highlighting of the line containing the todo comment
-- * before: highlights before the keyword (typically comment characters)
-- * keyword: highlights of the keyword
-- * after: highlights after the keyword (todo text)
highlight = {
-- enable multine todo comments
multiline = true,
-- lua pattern to match the next multiline from the start of the matched keyword
multiline_pattern = "^.",
-- extra lines that will be re-evaluated when changing a line
multiline_context = 10,
-- "fg" or "bg" or empty
before = "",
-- "fg", "bg", "wide", "wide_bg", "wide_fg" or empty. (wide and wide_bg is the same as bg,
-- but will also highlight surrounding characters, wide_fg acts accordingly but with fg)
keyword = "wide",
-- "fg" or "bg" or empty
after = "fg",
-- pattern or table of patterns, used for highlighting (vim regex)
pattern = [[.*<(KEYWORDS)\s*:]],
-- uses treesitter to match keywords in comments only
comments_only = true,
-- ignore lines longer than this
max_line_len = 400,
-- list of file types to exclude highlighting
exclude = {},
},
-- list of named colors where we try to extract the guifg from the
-- list of highlight groups or use the hex color if hl not found as a fallback
colors = {
error = { "DiagnosticError", "ErrorMsg", "#DC2626" },
warning = { "DiagnosticWarn", "WarningMsg", "#FBBF24" },
info = { "DiagnosticInfo", "#2563EB" },
hint = { "DiagnosticHint", "#10B981" },
default = { "Identifier", "#7C3AED" },
test = { "Identifier", "#FF00FF" },
},
search = {
command = "rg",
args = {
"--color=never",
"--no-heading",
"--with-filename",
"--line-number",
"--column",
},
-- regex that will be used to match keywords.
-- don't replace the (KEYWORDS) placeholder
pattern = [[\b(KEYWORDS):]], -- ripgrep regex
-- pattern = [[\b(KEYWORDS)\b]], -- match without the extra colon. You'll likely get false positives
},
},
},
-- Show todo comments, warnings, errors, ...
{
"folke/trouble.nvim",
-- cmd = { "TroubleToggle", "TodoTrouble" }
cmd = "TroubleToggle",
},
-- TOC (functions, macros, ...)
{
"yegappan/taglist",
cmd = "TlistToggle",
},
-- Code completion
{
"zbirenbaum/copilot.lua",
cmd = "Copilot",
event = "User AstroFile",
config = function()
require("copilot").setup {
suggestion = { enabled = false },
panel = { enabled = false },
}
end,
},
{
"zbirenbaum/copilot-cmp",
config = function() require("copilot_cmp").setup() end,
event = "User AstroFile",
},
-- PlatformIO
{
"normen/vim-pio",
-- event = "BufEnter"
cmd = { "PIO", "PIOInit", "PIOInstall", "PIOUninstall", "PIONewProject", "PIOAddLibrary", "PIORemoveLibrary" },
},
-- Jupiter notebooks
{
"kiyoon/jupynium.nvim",
build = "pip3 install --user .",
event = "BufEnter *.ju.py",
opts = {
python_host = "/usr/bin/python3",
},
},
{ "stevearc/dressing.nvim" },
-- Live server
{
"aurum77/live-server.nvim",
run = function() require("live_server.util").install() end,
cmd = { "LiveServer", "LiveServerStart", "LiveServerStop" },
},
-- Text related
{
-- LaTeX
"lervag/vimtex",
event = "BufEnter *.tex",
},
{
"iamcco/markdown-preview.nvim",
requires = { "tyru/open-browser.vim" },
event = "BufEnter *.md",
config = function() vim.fn["mkdp#util#install"]() end,
},
-- PlantUML
{
"weirongxu/plantuml-previewer.vim",
event = "BufEnter *.uml",
},
{
"aklt/plantuml-syntax",
event = "BufEnter *.uml",
},
-- Basic editor functionality
{
"Pocco81/auto-save.nvim",
event = "User AstroFile",
config = function() require("auto-save").setup() end,
},
-- Tasks.json
{
"stevearc/overseer.nvim",
cmd = {
"OverseerOpen",
"OverseerClose",
"OverseerToggle",
"OverseerSaveBundle",
"OverseerLoadBundle",
"OverseerDeleteBundle",
"OverseerRunCmd",
"OverseerRun",
"OverseerInfo",
"OverseerBuild",
"OverseerQuickAction",
"OverseerTaskAction ",
"OverseerClearCache",
},
opts = {},
},
-- { -- {
-- "ray-x/lsp_signature.nvim", -- "ray-x/lsp_signature.nvim",
-- event = "BufRead", -- event = "BufRead",
@ -640,37 +293,36 @@ local config = {
-- require("lsp_signature").setup() -- require("lsp_signature").setup()
-- end, -- end,
-- }, -- },
--
-- Plugin entries can also be used to override the default options for plugins as well
{ {
"goolord/alpha-nvim", "folke/todo-comments.nvim",
opts = function(_, opts) event = "BufRead",
-- customize the dashboard header config = function()
opts.section.header.val = { require("todo-comments").setup()
"███████ ████████ ███████ ███████ ██ ██ █████ ███████ ██ ██ ",
"██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ",
"███████ ██ █████ █████ █████ ███████ █████ ██ ██ ",
" ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ",
"███████ ██ ███████ ██ ██ ██ ██ ██ ██ ███████ ██████ ",
"",
" █████ ███████ ████████ ██████ ██████ ",
" ██ ██ ██ ██ ██ ██ ██ ██ ",
" ███████ ███████ ██ ██████ ██ ██ ",
" ██ ██ ██ ██ ██ ██ ██ ██ ",
" ██ ██ ███████ ██ ██ ██ ██████ ",
"",
" ███ ██ ██ ██ ██ ███ ███",
" ████ ██ ██ ██ ██ ████ ████",
" ██ ██ ██ ██ ██ ██ ██ ████ ██",
" ██ ██ ██ ██ ██ ██ ██ ██ ██",
" ██ ████ ████ ██ ██ ██",
}
return opts
end, end,
}, },
{ "github/copilot.vim" },
{ "puremourning/vimspector" },
{ "lervag/vimtex" },
{ {
"jose-elias-alvarez/null-ls.nvim", "Pocco81/auto-save.nvim",
opts = function(_, config) config = function()
require("auto-save").setup()
end,
},
{ "aklt/plantuml-syntax" },
-- We also support a key value style plugin definition similar to NvChad:
-- ["ray-x/lsp_signature.nvim"] = {
-- event = "BufRead",
-- config = function()
-- require("lsp_signature").setup()
-- end,
-- },
},
-- All other entries override the require("<key>").setup({...}) call for default plugins
["null-ls"] = function(config) -- overrides `require("null-ls").setup(config)`
-- config variable is the default configuration table for the setup function call -- config variable is the default configuration table for the setup function call
-- local null_ls = require "null-ls" -- local null_ls = require "null-ls"
@ -684,64 +336,68 @@ local config = {
} }
return config -- return final config table return config -- return final config table
end, end,
}, treesitter = { -- overrides `require("treesitter").setup(...)`
{
"nvim-treesitter/nvim-treesitter",
opts = {
-- ensure_installed = { "lua" }, -- ensure_installed = { "lua" },
}, },
},
-- use mason-lspconfig to configure LSP installations -- use mason-lspconfig to configure LSP installations
{ ["mason-lspconfig"] = { -- overrides `require("mason-lspconfig").setup(...)`
"williamboman/mason-lspconfig.nvim", -- ensure_installed = { "sumneko_lua" },
-- overrides `require("mason-lspconfig").setup(...)`
opts = {
-- ensure_installed = { "lua_ls" },
},
}, },
-- use mason-null-ls to configure Formatters/Linter installation for null-ls sources -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
{ ["mason-null-ls"] = { -- overrides `require("mason-null-ls").setup(...)`
"jay-babu/mason-null-ls.nvim",
-- overrides `require("mason-null-ls").setup(...)`
opts = {
-- ensure_installed = { "prettier", "stylua" }, -- ensure_installed = { "prettier", "stylua" },
}, },
}, },
{
"jay-babu/mason-nvim-dap.nvim", -- LuaSnip Options
-- overrides `require("mason-nvim-dap").setup(...)` luasnip = {
opts = { -- Add paths for including more VS Code style snippets in luasnip
-- ensure_installed = { "python" }, vscode_snippet_paths = {},
-- Extend filetypes
filetype_extend = {
-- javascript = { "javascriptreact" },
},
},
-- CMP Source Priorities
-- modify here the priorities of default cmp sources
-- higher value == higher priority
-- The value can also be set to a boolean for disabling default sources:
-- false == disabled
-- true == 1000
cmp = {
source_priority = {
nvim_lsp = 1000,
luasnip = 750,
buffer = 500,
path = 250,
},
},
-- Modify which-key registration (Use this with mappings table in the above.)
["which-key"] = {
-- Add bindings which show up as group name
register = {
-- first key is the mode, n == normal mode
n = {
-- second key is the prefix, <leader> prefixes
["<leader>"] = {
-- third key is the key to bring up next level and its displayed
-- group name in which-key top level menu
["b"] = { name = "Buffer" },
["d"] = {
name = "Debugging",
["b"] = { name = "Breakpoints" },
["s"] = { name = "Step" },
["f"] = { name = "Frames" },
},
["m"] = { name = "Markdown" },
["x"] = { name = "LaTeX" },
}, },
}, },
}, },
-- Customize Heirline options
heirline = {
-- -- Customize different separators between sections
-- separators = {
-- breadcrumbs = " > ",
-- tab = { "", "" },
-- },
-- -- Customize colors for each element each element has a `_fg` and a `_bg`
-- colors = function(colors)
-- colors.git_branch_fg = require("astronvim.utils").get_hlgroup "Conditional"
-- return colors
-- end,
-- -- Customize attributes of highlighting in Heirline components
-- attributes = {
-- -- styling choices for each heirline element, check possible attributes with `:h attr-list`
-- git_branch = { bold = true }, -- bold the git branch statusline component
-- },
-- -- Customize if icons should be highlighted
-- icon_highlights = {
-- breadcrumbs = false, -- LSP symbols in the breadcrumbs
-- file_icon = {
-- winbar = false, -- Filetype icon in the winbar inactive windows
-- statusline = true, -- Filetype icon in the statusline
-- tabline = true, -- Filetype icon in the tabline
-- },
-- },
}, },
-- This function is run last and is a good place to configuring -- This function is run last and is a good place to configuring
-- augroups/autocommands and custom filetypes also this just pure lua so -- augroups/autocommands and custom filetypes also this just pure lua so
-- anything that doesn't fit in the normal config locations above can go here -- anything that doesn't fit in the normal config locations above can go here
@ -758,6 +414,24 @@ local config = {
-- ["~/%.config/foo/.*"] = "fooscript", -- ["~/%.config/foo/.*"] = "fooscript",
-- }, -- },
-- } -- }
local function alpha_on_bye(cmd)
local bufs = vim.fn.getbufinfo { buflisted = true }
vim.cmd(cmd)
if require("core.utils").is_available "alpha-nvim" and not bufs[2] then
require("alpha").start(true)
end
end
vim.keymap.del("n", "<leader>c")
if require("core.utils").is_available "bufdelete.nvim" then
vim.keymap.set("n", "<leader>c", function()
alpha_on_bye "Bdelete!"
end, { desc = "Close buffer" })
else
vim.keymap.set("n", "<leader>c", function()
alpha_on_bye "bdelete!"
end, { desc = "Close buffer" })
end
end, end,
} }

25
plugins/cmp.lua Normal file
View file

@ -0,0 +1,25 @@
local cmp = require "cmp"
local luasnip = require "luasnip"
return {
preselect = cmp.PreselectMode.None,
mapping = {
["<CR>"] = cmp.mapping.confirm { select = false },
["<Tab>"] = cmp.mapping(function(fallback)
vim.api.nvim_feedkeys(vim.fn['copilot#Accept'](vim.api.nvim_replace_termcodes('<Tab>', true, true, true)), 'n',
true)
end)
-- if luasnip.expandable() then
-- luasnip.expand()
-- elseif luasnip.expand_or_jumpable() then
-- luasnip.expand_or_jump()
-- fallback()
-- end
-- end, {
-- "i",
-- "s",
-- }),
},
experimental = {
ghost_text = false -- this feature conflict with copilot.vim's preview.
}
}