diff --git a/config/automatrop/roles/vim/templates/pluginlist.j2 b/config/automatrop/roles/vim/templates/pluginlist.j2
index abaa6be..aee12e7 100644
--- a/config/automatrop/roles/vim/templates/pluginlist.j2
+++ b/config/automatrop/roles/vim/templates/pluginlist.j2
@@ -16,15 +16,6 @@
 " Theme
 source ~/.config/vim/theme.vim
 
-" Treesitter
-{% if variant == 'nvim' %}
-{{ use_plugin('treesitter') }}
-{{ use_plugin('ts-rainbow') }}
-{# TODO
-{{ use_plugin('indent-blankline') }}
-#}
-{% endif %}
-
 " Snippets
 {{ use_plugin('vsnip') }}
 
diff --git a/config/automatrop/roles/vim/templates/plugins/indent-blankline.j2 b/config/automatrop/roles/vim/templates/plugins/indent-blankline.j2
deleted file mode 100644
index 138e4b1..0000000
--- a/config/automatrop/roles/vim/templates/plugins/indent-blankline.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{# Show ident lines #}
-{{ add_source('lukas-reineke/indent-blankline.nvim') -}}
-let g:indent_blankline_char_highlight_list = ['Error', 'Function']
diff --git a/config/automatrop/roles/vim/templates/plugins/treesitter.j2 b/config/automatrop/roles/vim/templates/plugins/treesitter.j2
deleted file mode 100644
index 0bfeba3..0000000
--- a/config/automatrop/roles/vim/templates/plugins/treesitter.j2
+++ /dev/null
@@ -1,66 +0,0 @@
-{# Allow for better syntax highlighting. Bit experimental #}
-{{ add_source('nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}) -}}
-{# To check if it's really working
-{{ add_source('nvim-treesitter/playground') -}}
-#}
-lua <<EOF
-require'nvim-treesitter.configs'.setup {
-  ensure_installed = {
-    "bash",
-    "bibtex",
-    "c",
-    "cmake",
-    "comment",
-    "cpp",
-    "css",
-    "diff",
-    "dockerfile",
-    "dot",
-    "git_rebase",
-    "gitattributes",
-    "gitignore",
-    "go",
-    "html",
-    "http",
-    "java",
-    "javascript",
-    "json",
-    "latex",
-    "llvm",
-    "lua",
-    "make",
-    "markdown",
-    "markdown_inline",
-    "perl",
-    "php",
-    "python",
-    "regex",
-    "ruby",
-    "scss",
-    "sql",
-    "verilog",
-    "vim",
-    "yaml",
-  },
-  ignore_install = {},
-  highlight = {
-    enable = true,
-  },
-  incremental_selection = {
-    enable = true,
-    keymaps = {
-      init_selection = "gnn",
-      node_incremental = "grn",
-      scope_incremental = "grc",
-      node_decremental = "grm",
-    },
-  },
-{# Not very working yet, I'm afraid
-  indent = {
-    enable = true,
-  },
-#}
-}
-EOF
-
-{# TODO Investigate https://github.com/nvim-treesitter/nvim-treesitter-textobjects #}
diff --git a/config/nix/hm/vim.nix b/config/nix/hm/vim.nix
index b9428f7..6cfbaf3 100644
--- a/config/nix/hm/vim.nix
+++ b/config/nix/hm/vim.nix
@@ -154,6 +154,17 @@ in
         autocmd.enabled = true;
       };
       lspkind.enable = true; # Add icons to LSP completions
+
+      # Treesitter
+      treesitter = { # Allows for better syntax highlighting
+        enable = true;
+        incrementalSelection = {
+          enable = true;
+        };
+        # indent = true; # Not very working last time I tried apparently
+      };
+      # TODO Investigate https://github.com/nvim-treesitter/nvim-treesitter-textobjects
+      indent-blankline.enable = true; # 23.11 integrate with rainbow-delimiters and use more of the options
     };
     extraPlugins = with pkgs.vimPlugins; [
       nvim-scrollview # Scroll bar
@@ -185,11 +196,16 @@ in
 
       # Language server
       lsp_signature-nvim # Show argument definition when typing a function
+
+      # Treesitter
+      nvim-ts-rainbow # Randomly color parenthesis pairs
+      # 23.11: Replace with plugins.rainbow-delimiters
     ];
     extraConfigLua = lib.strings.concatMapStringsSep "\n" (f: builtins.readFile f) [
       ./vim/feline.lua
       ./vim/symbols-outline-nvim.lua
       ./vim/lsp_signature-nvim.lua
+      ./vim/nvim-ts-rainbow.lua
     ];
     extraConfigVim = ''
       " vim-gutentags
diff --git a/config/automatrop/roles/vim/templates/plugins/ts-rainbow.j2 b/config/nix/hm/vim/nvim-ts-rainbow.lua
similarity index 73%
rename from config/automatrop/roles/vim/templates/plugins/ts-rainbow.j2
rename to config/nix/hm/vim/nvim-ts-rainbow.lua
index 4663f6e..2047385 100644
--- a/config/automatrop/roles/vim/templates/plugins/ts-rainbow.j2
+++ b/config/nix/hm/vim/nvim-ts-rainbow.lua
@@ -1,6 +1,3 @@
-{# Randomly color parentheses pairs #}
-{{ add_source('p00f/nvim-ts-rainbow') -}}
-lua << EOF
 require'nvim-treesitter.configs'.setup {
   rainbow = {
     enable = true,
@@ -8,4 +5,3 @@ require'nvim-treesitter.configs'.setup {
     max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
   }
 }
-EOF