diff --git a/init.vim b/init.vim index 1786b11..33b1016 100644 --- a/init.vim +++ b/init.vim @@ -12,6 +12,7 @@ so ~/.config/nvim/colorizer.lua so ~/.config/nvim/autopairs.lua so ~/.config/nvim/lualine.lua so ~/.config/nvim/todo.lua +so ~/.config/nvim/leap.lua set rnu set number diff --git a/leap.lua b/leap.lua new file mode 100644 index 0000000..c0aeeef --- /dev/null +++ b/leap.lua @@ -0,0 +1 @@ +require('leap').add_default_mappings() diff --git a/lua-tree.lua b/lua-tree.lua index b6b9b13..73c4056 100644 --- a/lua-tree.lua +++ b/lua-tree.lua @@ -1,112 +1,4 @@ -require'nvim-tree'.setup { - auto_reload_on_write = true, - disable_netrw = false, - hijack_cursor = false, - hijack_netrw = true, - hijack_unnamed_buffer_when_opening = false, - ignore_buffer_on_setup = false, - open_on_setup = false, - open_on_setup_file = false, - open_on_tab = false, - sort_by = "name", - update_cwd = false, - view = { - width = 30, - hide_root_folder = false, - side = "left", - preserve_window_proportions = false, - number = false, - relativenumber = false, - signcolumn = "yes", - mappings = { - custom_only = false, - list = { - -- user mappings go here - }, - }, - }, - renderer = { - indent_markers = { - enable = false, - icons = { - corner = "└ ", - edge = "│ ", - none = " ", - }, - }, - icons = { - webdev_colors = true, - git_placement = "before", - } - }, - hijack_directories = { - enable = true, - auto_open = true, - }, - update_focused_file = { - enable = true, - update_cwd = true, - ignore_list = {}, - }, - ignore_ft_on_setup = {}, - system_open = { - cmd = "", - args = {}, - }, - diagnostics = { - enable = false, - show_on_dirs = false, - icons = { - hint = "", - info = "", - warning = "", - error = "", - }, - }, - filters = { - dotfiles = false, - custom = {}, - exclude = {}, - }, - git = { - enable = true, - ignore = true, - timeout = 400, - }, - actions = { - use_system_clipboard = true, - change_dir = { - enable = true, - global = false, - restrict_above_cwd = false, - }, - open_file = { - quit_on_open = false, - resize_window = true, - window_picker = { - enable = true, - chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", - exclude = { - filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" }, - buftype = { "nofile", "terminal", "help" }, - }, - }, - }, - }, - trash = { - cmd = "trash", - require_confirm = true, - }, - log = { - enable = false, - truncate = false, - types = { - all = false, - config = false, - copy_paste = false, - diagnostics = false, - git = false, - profile = false, - }, - }, -} +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 + +require'nvim-tree'.setup() diff --git a/treesitter.lua b/treesitter.lua index d11d7f4..0609663 100644 --- a/treesitter.lua +++ b/treesitter.lua @@ -9,17 +9,8 @@ require'nvim-treesitter.configs'.setup { }, rainbow = { enable = true, - extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean - max_file_lines = nil, -- Do not enable for files with more than n lines, int - }, - textsubjects = { - enable = true, - prev_selection = '', -- (Optional) keymap to select the previous selection - keymaps = { - [','] = 'textsubjects-smart', - [';'] = 'textsubjects-container-outer', - ['i;'] = 'textsubjects-container-inner', - }, + query = 'rainbow-parens', + strategy = require('ts-rainbow').strategy.global }, refactor = { highlight_definitions = { diff --git a/version.txt b/version.txt index 6a2b0ac..795460f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.0.1 \ No newline at end of file +v1.1.0 diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 359cc5b..818503c 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -10,11 +10,10 @@ call plug#begin('~/.config/nvim/autoload/plugged') " syntax Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} - Plug 'p00f/nvim-ts-rainbow' + Plug 'HiPhish/nvim-ts-rainbow2' Plug 'nvim-treesitter/nvim-treesitter-refactor' Plug 'norcalli/nvim-colorizer.lua' Plug 'lukas-reineke/indent-blankline.nvim' - Plug 'RRethy/nvim-treesitter-textsubjects' " status bar Plug 'nvim-lualine/lualine.nvim' @@ -46,6 +45,7 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'akinsho/toggleterm.nvim' Plug 'numToStr/Comment.nvim' Plug 'folke/todo-comments.nvim' + Plug 'ggandor/leap.nvim' " git Plug 'lewis6991/gitsigns.nvim'