From e59fc32ff04fa7ca05fdf135e628757270984185 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Mon, 14 Mar 2022 10:43:50 +0100
Subject: [PATCH] Import pkgs.vimPlugins to shorten plugin definitions

---
 home/programs/neovim.nix | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix
index 62abcc4..2d26454 100644
--- a/home/programs/neovim.nix
+++ b/home/programs/neovim.nix
@@ -177,7 +177,7 @@ in {
     sqlparse
   ]);
 
-  plugins = [
+  plugins = with pkgs.vimPlugins; [
 
     # My own plugins
 
@@ -190,12 +190,12 @@ in {
     # More UI related
 
     {
-      plugin = pkgs.vimPlugins.nerdtree;
+      plugin = nerdtree;
       config = pkgs.lib.fileContents ./neovim/plugins/nerdtree.vim;
     }
 
     {
-      plugin = pkgs.vimPlugins.undotree;
+      plugin = undotree;
       config = pkgs.lib.fileContents ./neovim/plugins/undotree.vim;
     }
 
@@ -208,7 +208,7 @@ in {
     }
 
     {
-      plugin = pkgs.vimPlugins.ctrlp-vim;
+      plugin = ctrlp-vim;
       config = pkgs.lib.fileContents ./neovim/plugins/ctrlp.vim;
     }
 
@@ -228,16 +228,16 @@ in {
     diff-fold
 
     {
-      plugin = pkgs.vimPlugins.vim-snipmate;
+      plugin = vim-snipmate;
       config = ''
         let g:snipMate = { 'snippet_version' : 0 }
       '';
     }
 
-    pkgs.vimPlugins.vim-fugitive
-    pkgs.vimPlugins.vim-commentary
-    pkgs.vimPlugins.vim-indent-object
-    pkgs.vimPlugins.vim-textobj-comment
+    vim-fugitive
+    vim-commentary
+    vim-indent-object
+    vim-textobj-comment
 
     {
       plugin = vdebug;
@@ -262,23 +262,23 @@ in {
     # More related to testing, linting, …
 
     {
-      plugin = pkgs.vimPlugins.ale;
+      plugin = ale;
       config = pkgs.lib.fileContents ./neovim/plugins/ale.vim;
     }
 
     {
-      plugin = pkgs.vimPlugins.syntastic;
+      plugin = syntastic;
       config = pkgs.lib.fileContents ./neovim/plugins/syntastic.vim;
     }
 
     {
-      plugin = pkgs.vimPlugins.vim-test;
+      plugin = vim-test;
       config = pkgs.lib.fileContents ./neovim/plugins/test.vim;
     }
 
     # Dependencies for other plugins
 
-    pkgs.vimPlugins.vim-addon-mw-utils
-    pkgs.vimPlugins.vim-textobj-user
+    vim-addon-mw-utils
+    vim-textobj-user
   ];
 }