Skip to content

Commit 8b0488c

Browse files
committed
Added leap package, updated treesitter-rainbow package and updated nvim tree config
1 parent d51d062 commit 8b0488c

File tree

6 files changed

+11
-126
lines changed

6 files changed

+11
-126
lines changed

init.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ so ~/.config/nvim/colorizer.lua
1212
so ~/.config/nvim/autopairs.lua
1313
so ~/.config/nvim/lualine.lua
1414
so ~/.config/nvim/todo.lua
15+
so ~/.config/nvim/leap.lua
1516

1617
set rnu
1718
set number

leap.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
require('leap').add_default_mappings()

lua-tree.lua

Lines changed: 4 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,4 @@
1-
require'nvim-tree'.setup {
2-
auto_reload_on_write = true,
3-
disable_netrw = false,
4-
hijack_cursor = false,
5-
hijack_netrw = true,
6-
hijack_unnamed_buffer_when_opening = false,
7-
ignore_buffer_on_setup = false,
8-
open_on_setup = false,
9-
open_on_setup_file = false,
10-
open_on_tab = false,
11-
sort_by = "name",
12-
update_cwd = false,
13-
view = {
14-
width = 30,
15-
hide_root_folder = false,
16-
side = "left",
17-
preserve_window_proportions = false,
18-
number = false,
19-
relativenumber = false,
20-
signcolumn = "yes",
21-
mappings = {
22-
custom_only = false,
23-
list = {
24-
-- user mappings go here
25-
},
26-
},
27-
},
28-
renderer = {
29-
indent_markers = {
30-
enable = false,
31-
icons = {
32-
corner = "",
33-
edge = "",
34-
none = " ",
35-
},
36-
},
37-
icons = {
38-
webdev_colors = true,
39-
git_placement = "before",
40-
}
41-
},
42-
hijack_directories = {
43-
enable = true,
44-
auto_open = true,
45-
},
46-
update_focused_file = {
47-
enable = true,
48-
update_cwd = true,
49-
ignore_list = {},
50-
},
51-
ignore_ft_on_setup = {},
52-
system_open = {
53-
cmd = "",
54-
args = {},
55-
},
56-
diagnostics = {
57-
enable = false,
58-
show_on_dirs = false,
59-
icons = {
60-
hint = "",
61-
info = "",
62-
warning = "",
63-
error = "",
64-
},
65-
},
66-
filters = {
67-
dotfiles = false,
68-
custom = {},
69-
exclude = {},
70-
},
71-
git = {
72-
enable = true,
73-
ignore = true,
74-
timeout = 400,
75-
},
76-
actions = {
77-
use_system_clipboard = true,
78-
change_dir = {
79-
enable = true,
80-
global = false,
81-
restrict_above_cwd = false,
82-
},
83-
open_file = {
84-
quit_on_open = false,
85-
resize_window = true,
86-
window_picker = {
87-
enable = true,
88-
chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
89-
exclude = {
90-
filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
91-
buftype = { "nofile", "terminal", "help" },
92-
},
93-
},
94-
},
95-
},
96-
trash = {
97-
cmd = "trash",
98-
require_confirm = true,
99-
},
100-
log = {
101-
enable = false,
102-
truncate = false,
103-
types = {
104-
all = false,
105-
config = false,
106-
copy_paste = false,
107-
diagnostics = false,
108-
git = false,
109-
profile = false,
110-
},
111-
},
112-
}
1+
vim.g.loaded_netrw = 1
2+
vim.g.loaded_netrwPlugin = 1
3+
4+
require'nvim-tree'.setup()

treesitter.lua

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,8 @@ require'nvim-treesitter.configs'.setup {
99
},
1010
rainbow = {
1111
enable = true,
12-
extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean
13-
max_file_lines = nil, -- Do not enable for files with more than n lines, int
14-
},
15-
textsubjects = {
16-
enable = true,
17-
prev_selection = '<cr>', -- (Optional) keymap to select the previous selection
18-
keymaps = {
19-
[','] = 'textsubjects-smart',
20-
[';'] = 'textsubjects-container-outer',
21-
['i;'] = 'textsubjects-container-inner',
22-
},
12+
query = 'rainbow-parens',
13+
strategy = require('ts-rainbow').strategy.global
2314
},
2415
refactor = {
2516
highlight_definitions = {

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.0.1
1+
v1.1.0

vim-plug/plugins.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ call plug#begin('~/.config/nvim/autoload/plugged')
1010

1111
" syntax
1212
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
13-
Plug 'p00f/nvim-ts-rainbow'
13+
Plug 'HiPhish/nvim-ts-rainbow2'
1414
Plug 'nvim-treesitter/nvim-treesitter-refactor'
1515
Plug 'norcalli/nvim-colorizer.lua'
1616
Plug 'lukas-reineke/indent-blankline.nvim'
17-
Plug 'RRethy/nvim-treesitter-textsubjects'
1817

1918
" status bar
2019
Plug 'nvim-lualine/lualine.nvim'
@@ -46,6 +45,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
4645
Plug 'akinsho/toggleterm.nvim'
4746
Plug 'numToStr/Comment.nvim'
4847
Plug 'folke/todo-comments.nvim'
48+
Plug 'ggandor/leap.nvim'
4949

5050
" git
5151
Plug 'lewis6991/gitsigns.nvim'

0 commit comments

Comments
 (0)