commit 4c47a25e15e7cee437085f1a17ba740d57da68a4
parent 0cf0d7768170cd68ff4974601a4ecb78e521992f
Author: Alex Balgavy <alex@balgavy.eu>
Date: Mon, 5 Feb 2024 14:12:24 +0100
nvim: misc settings
Diffstat:
3 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
@@ -1,34 +1,36 @@
{
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
- "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" },
+ "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
+ "aerial.nvim": { "branch": "master", "commit": "d21482d3be3228dde594aba31106db428292742c" },
"cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
- "diagflow.nvim": { "branch": "main", "commit": "6882a91ec0473fbc4a04881c9bf7eaeb08185cac" },
- "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" },
- "fidget.nvim": { "branch": "main", "commit": "3a93300c076109d86c7ce35ec67a8034ae6ba9db" },
+ "diagflow.nvim": { "branch": "main", "commit": "6d2ad945ddbc46f42a0a2e7618975a5f3d2e7dbe" },
+ "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
+ "fidget.nvim": { "branch": "main", "commit": "a3e1e79116ceb93d4c8c0ff432bf506b3213a24d" },
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
"formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" },
- "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" },
- "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" },
- "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+ "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
+ "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
+ "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
"lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
"lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" },
- "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
- "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
+ "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
+ "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" },
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
- "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
- "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" },
- "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" },
- "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" },
+ "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
+ "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
+ "nvim-dap-python": { "branch": "master", "commit": "f5b6f3a90aae0284b61fb3565e575267c19a16e6" },
+ "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
- "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" },
- "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" },
- "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+ "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" },
+ "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" },
+ "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" },
+ "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
"telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
- "telescope.nvim": { "branch": "master", "commit": "4367e05c06d19f28c514e1498bcd9410f4bc65b2" },
+ "telescope.nvim": { "branch": "master", "commit": "7b5c5f56a21e82fdcfe5b250278b8dfc4b1cbab4" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
}
\ No newline at end of file
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
@@ -199,7 +199,11 @@ return {
"folke/flash.nvim",
event = "VeryLazy",
---@type Flash.Config
- opts = {},
+ opts = {
+ search = {
+ trigger = "\\",
+ }
+ },
-- stylua: ignore
keys = {
{ "<leader><leader>s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
@@ -233,6 +237,22 @@ return {
-- },
{
'dgagn/diagflow.nvim',
- opts = {}
+ opts = {},
+ event = "VeryLazy",
+ },
+
+ {
+ 'stevearc/aerial.nvim',
+ opts = {},
+ -- Optional dependencies
+ dependencies = {
+ "nvim-treesitter/nvim-treesitter",
+ "nvim-tree/nvim-web-devicons"
+ },
+ keys = {
+ { "<leader>tt", "<cmd>AerialToggle!<cr>", desc = "Toggle tagbar" },
+ { "<leader>to", "<cmd>AerialOpen<cr>", desc = "Open and jump to tagbar" },
+ },
+ backends = { "treesitter", "lsp", "markdown", "man" },
},
}
diff --git a/vim/vimrc b/vim/vimrc
@@ -14,7 +14,7 @@ call plug#begin('~/.vim/plugged')
Plug 'junegunn/vim-plug'
" Vim tester
-Plug 'junegunn/vader.vim'
+Plug 'junegunn/vader.vim', { 'on': 'Vader', 'for': 'vader' }
" A color table with xterm color codes
Plug 'guns/xterm-color-table.vim'
@@ -34,9 +34,6 @@ Plug 'tpope/vim-eunuch'
" Project management
Plug 'tpope/vim-projectionist'
-" A tag overview on the right side
-Plug 'majutsushi/tagbar'
-
" Git wrapper from tpope
Plug 'tpope/vim-fugitive'
@@ -50,9 +47,6 @@ Plug 'junegunn/limelight.vim'
" Better CSV editing
Plug 'mechatroner/rainbow_csv'
-" Display ANSI color codes
-Plug 'vim-scripts/AnsiEsc.vim'
-
" Disable hlsearch after finished searching
Plug 'romainl/vim-cool'
@@ -63,19 +57,16 @@ Plug 'lervag/vimtex'
Plug 'tpope/vim-abolish'
" Highlight hex colors
-Plug 'chrisbra/colorizer'
-
-" Pywal scheme in vim
-Plug 'dylanaraps/wal.vim'
+Plug 'chrisbra/colorizer', { 'on': 'ColorHighlight' }
" Bracket bindings for filetypes
Plug 'arp242/jumpy.vim'
" Omnifuncs
-Plug 'myhere/vim-nodejs-complete'
-Plug 'othree/html5.vim'
-Plug 'vim-scripts/OmniCppComplete'
-Plug 'vim-scripts/pythoncomplete'
+Plug 'myhere/vim-nodejs-complete', { 'for': 'js' }
+Plug 'othree/html5.vim', { 'for': 'html' }
+Plug 'vim-scripts/OmniCppComplete', { 'for': 'cpp' }
+Plug 'vim-scripts/pythoncomplete', { 'for': 'python' }
" Alignment
Plug 'junegunn/vim-easy-align'
@@ -93,7 +84,7 @@ Plug 'psliwka/vim-smoothie'
Plug 'tpope/vim-dispatch'
" Vimscript testing
-Plug 'tpope/vim-scriptease'
+Plug 'tpope/vim-scriptease', { 'on': 'Breakadd' }
" Set 'path', 'suffixesadd', 'include', 'includeexpr', 'define'
" automatically for selected filetypes.
@@ -118,14 +109,11 @@ Plug 'thezeroalpha/vim-literate-markdown'
Plug 'axvr/zepl.vim'
" Center the window vertically (like Goyo but keeps statusline/whatever)
-Plug 'jmckiern/vim-venter'
+Plug 'jmckiern/vim-venter', { 'on': 'Venter' }
" Edit files directly in quickfix window
Plug 'stefandtw/quickfix-reflector.vim'
-" Browse github repositories
-Plug 'skanehira/gh.vim'
-
" Minesweeper
Plug 'iqxd/vim-mine-sweeping'
@@ -134,9 +122,6 @@ Plug 'jceb/vim-orgmode', { 'for': 'org' }
" Rust
Plug 'rust-lang/rust.vim', { 'for': 'rust' }
-" Show context
-" Plug 'wellle/context.vim'
-
" Fuzzy finder in vim
Plug 'junegunn/fzf', { 'dir': '$DOTFILES/tools/fzf', 'do': './install --all --xdg --no-fish'}
Plug 'junegunn/fzf.vim'
@@ -148,6 +133,9 @@ Plug 'mbbill/undotree'
" Vim-only
if !has('nvim')
+ " A tag overview on the right side
+ Plug 'majutsushi/tagbar'
+
" Substitute preview
Plug 'markonm/traces.vim'
@@ -161,6 +149,9 @@ if !has('nvim')
" Simple commenting
Plug 'tpope/vim-commentary'
+ " Display ANSI color codes
+ Plug 'vim-scripts/AnsiEsc.vim', { 'on': 'AnsiEsc' }
+
endif
call plug#end()
