From 5a504d3aa80bc7dcbd049aafddefe23156cd3666 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Thu, 23 Jun 2022 16:11:19 +0300 Subject: [PATCH] nix/nvim: add treesitter configs --- nix/progs/nvim/config.lua | 16 ++++++++++++++++ nix/progs/nvim/config.vim | 26 ++++++++++++++++++++++++++ nix/progs/nvim/default.nix | 4 ++++ nix/progs/nvim/plugins.vim | 26 ++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 nix/progs/nvim/config.lua diff --git a/nix/progs/nvim/config.lua b/nix/progs/nvim/config.lua new file mode 100644 index 0000000..fbe371c --- /dev/null +++ b/nix/progs/nvim/config.lua @@ -0,0 +1,16 @@ +-- TreeSitter +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" + -- ensure_installed = { "nix", "typescript", "tsx" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + -- sync_install = false, + + highlight = { + enable = true, + }, + + indent = { + enable = true, + }, +} diff --git a/nix/progs/nvim/config.vim b/nix/progs/nvim/config.vim index 49f1798..95a7cac 100644 --- a/nix/progs/nvim/config.vim +++ b/nix/progs/nvim/config.vim @@ -126,3 +126,29 @@ nnoremap sv :source $MYVIMRC cabbrev bsp belowright split cabbrev rvsp belowright vsplit +" TreeSitter +lua << EOF +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" + ensure_installed = { + "nix", + "typescript", + "tsx", + "rust", + "haskell", + "json", + "yaml", + }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + highlight = { + enable = true, + }, + + indent = { + enable = true, + }, +} +EOF diff --git a/nix/progs/nvim/default.nix b/nix/progs/nvim/default.nix index 13384be..63625d2 100644 --- a/nix/progs/nvim/default.nix +++ b/nix/progs/nvim/default.nix @@ -39,6 +39,10 @@ let cocSettings = builtins.toJSON (import ./coc_settings.nix); vimConfig = baseConfig + pluginsConfig + cocConfig; + + # I get an error if I try copying lua script to lua folder + # TODO: think about this solution + luaConfig = builtins.readFile ./config.lua; in { options.progs.nvim = { diff --git a/nix/progs/nvim/plugins.vim b/nix/progs/nvim/plugins.vim index af29321..8c714fa 100644 --- a/nix/progs/nvim/plugins.vim +++ b/nix/progs/nvim/plugins.vim @@ -38,3 +38,29 @@ let g:gitgutter_map_keys = 0 nnoremap ghp :GitGutterPreviewHunk +" TreeSitter +lua << EOF +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" + ensure_installed = { + "nix", + "typescript", + "tsx", + "rust", + "haskell", + "json", + "yaml", + }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + highlight = { + enable = true, + }, + + indent = { + enable = true, + }, +} +EOF