summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-03-16 15:10:47 +0100
committerlassulus <lass@lassul.us>2017-03-16 15:10:47 +0100
commit5ae78442de2614027aab002426d258ac620fba78 (patch)
treeab811276c439eb869a61f8e6159f73bc53cd7bfa
parent8a04d2a55ce6c4a5d0df37261a0ae7528666b16a (diff)
parent75040367ffe94c6c19973ccc1dd5efe24afac78d (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--tv/2configs/vim.nix20
1 files changed, 12 insertions, 8 deletions
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 1ffafe9c9..8b83b0503 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -297,14 +297,18 @@ let {
alldirs = attrValues dirs ++ map dirOf (attrValues files);
in unique (sort lessThan alldirs);
- vim = pkgs.writeDashBin "vim" ''
- set -efu
- (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
- if test $# = 0 && test -e "$PWD/.ctrlpignore"; then
- set -- +CtrlP
- fi
- exec ${pkgs.vim}/bin/vim "$@"
- '';
+ vim = pkgs.concat "vim" [
+ pkgs.vim_configurable
+ (pkgs.writeDashBin "vim" ''
+ set -efu
+ (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
+ if test $# = 0 && test -e "$PWD/.ctrlpignore"; then
+ set -- +CtrlP
+ fi
+ # vim-orgmode needs Python, thus vim_configurable instead of just vim
+ exec ${pkgs.vim_configurable}/bin/vim "$@"
+ '')
+ ];
vimrc = pkgs.writeText "vimrc" ''
set nocompatible