From 55f141c539070fe96a96c360287b6646fb455058 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Fri, 30 Apr 2021 12:53:30 +0200 Subject: [PATCH] treesitter --- files/.config/nvim/fnl/keybinds.fnl | 20 +++++++++++++++++--- files/.config/nvim/fnl/plugins/lsp.fnl | 18 +++++++++++++++++- files/.config/nvim/plugins.lua | 11 ++++++++--- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/files/.config/nvim/fnl/keybinds.fnl b/files/.config/nvim/fnl/keybinds.fnl index a48fedc..cecf9aa 100644 --- a/files/.config/nvim/fnl/keybinds.fnl +++ b/files/.config/nvim/fnl/keybinds.fnl @@ -3,7 +3,8 @@ nvim aniseed.nvim utils utils fennel aniseed.fennel - wk which-key} + wk which-key + treesitter-selection nvim-treesitter.incremental_selection} require-macros [macros]}) @@ -68,12 +69,25 @@ { :prefix ""}) (wk.register - { - "" "which_key_ignore" + { "" "which_key_ignore" + "gss" "init selection" "z" { :name "+folds" "c" (cmd "foldclose" "close fold") "o" (cmd "foldopen" "open fold")}}) + +(wk.register + { "" "which_key_ignore"} + { :mode "i"}) +(wk.register + { :name "+Selection" + "j" "increment selection" + "k" "decrement selection" + "l" "increment node" + "h" "decrement node"} + { :prefix "gs" + :mode "v"}) + (set nvim.o.timeoutlen 200) diff --git a/files/.config/nvim/fnl/plugins/lsp.fnl b/files/.config/nvim/fnl/plugins/lsp.fnl index 37527a6..e1980e6 100644 --- a/files/.config/nvim/fnl/plugins/lsp.fnl +++ b/files/.config/nvim/fnl/plugins/lsp.fnl @@ -9,7 +9,8 @@ compe compe lsp_signature lsp_signature symbols-outline symbols-outline - trouble trouble} + trouble trouble + nvim-treesitter-configs nvim-treesitter.configs} require-macros [macros]}) @@ -18,6 +19,19 @@ (symbols-outline.setup { :highlight_hovered_item true :show_guides true}) (set vim.o.signcolumn "yes") +(nvim-treesitter-configs.setup + { :ensure_installed "maintained" + :highlight { :enable true} + :indent { :enable true} + :incremental_selection + { :enable true + :keymaps { :init_selection "gss" + :node_incremental "gsl" + :node_decremental "gsh" + :scope_incremental "gsj" + :scope_decremental "gsk"}}}) + + ; LSP config -------------------------------------------------------------------------------- {{{{{ (fn on_attach [client bufnr] @@ -136,4 +150,6 @@ ; }}}}} + + ; vim:foldmarker={{{{{,}}}}} diff --git a/files/.config/nvim/plugins.lua b/files/.config/nvim/plugins.lua index 5c33cc0..cdfb8f6 100644 --- a/files/.config/nvim/plugins.lua +++ b/files/.config/nvim/plugins.lua @@ -12,13 +12,18 @@ end vim.cmd [[packadd packer.nvim]] require("packer").startup(function(use) - + use_rocks "rtsisyk/fun" + use { + "nvim-treesitter/nvim-treesitter", + run = ":TSUpdate" + } + + --use "code-biscuits/nvim-biscuits" + use "simrat39/symbols-outline.nvim" - use "folke/which-key.nvim" - use "folke/lsp-trouble.nvim"