summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-02-13 15:10:35 +0100
committerGitHub <noreply@github.com>2017-02-13 15:10:35 +0100
commitd12639cb2853b2c2c6d4dba3357fdf066014a388 (patch)
tree2a1caa47f996e7224417bd92ae6ab41ad7cf49fc
parent04f72ca64c927224e4496c7041c0b8115c811e27 (diff)
parentb7d65f8af0fa6422b1f6fae492ed02aeca633825 (diff)
downloadnixpkgs-d12639cb2853b2c2c6d4dba3357fdf066014a388.tar
nixpkgs-d12639cb2853b2c2c6d4dba3357fdf066014a388.tar.gz
nixpkgs-d12639cb2853b2c2c6d4dba3357fdf066014a388.tar.bz2
nixpkgs-d12639cb2853b2c2c6d4dba3357fdf066014a388.tar.lz
nixpkgs-d12639cb2853b2c2c6d4dba3357fdf066014a388.tar.xz
nixpkgs-d12639cb2853b2c2c6d4dba3357fdf066014a388.tar.zst
nixpkgs-d12639cb2853b2c2c6d4dba3357fdf066014a388.zip
Merge pull request #22739 from Mic92/vam
vim.vam: fix filetype detection
-rw-r--r--pkgs/misc/vim-plugins/vim-utils.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 3ce88320ddf..d714b290a90 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -65,8 +65,8 @@ See vimHelpTags sample code below.
 
 CONTRIBUTING AND CUSTOMIZING
 ============================
-The example file pkgs/misc/vim-plugins/default.nix provides both: 
-* manually mantained plugins 
+The example file pkgs/misc/vim-plugins/default.nix provides both:
+* manually mantained plugins
 * plugins created by VAM's nix#ExportPluginsForNix implementation
 
 I highly recommend to lookup vim plugin attribute names at the [vim-pi] project
@@ -105,7 +105,7 @@ Then ":source %" it.
 
 nix#ExportPluginsForNix is provided by ./vim2nix
 
-A buffer will open containing the plugin derivation lines as well list 
+A buffer will open containing the plugin derivation lines as well list
 fitting the vimrcConfig.vam.pluginDictionaries option.
 
 Thus the most simple usage would be:
@@ -125,7 +125,7 @@ Thus the most simple usage would be:
       vimrcConfig.vam.knownPlugins = vimPlugins;
       vimrcConfig.vam.pluginDictionaries = [
           # the plugin list form ~/.vim-scripts turned into nix format added to
-          # the buffer created by the nix#ExportPluginsForNix 
+          # the buffer created by the nix#ExportPluginsForNix
       ];
     }
 
@@ -262,13 +262,14 @@ let
   in writeText "vimrc" ''
   " minimal setup, generated by NIX
   set nocompatible
-  filetype indent plugin on | syn on
 
   ${vamImpl}
   ${pathogenImpl}
   ${vundleImpl}
   ${neobundleImpl}
 
+  filetype indent plugin on | syn on
+
   ${customRC}
   '';