summaryrefslogtreecommitdiffstats
path: root/tv/2configs/vim.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-03-15 02:10:31 +0100
committertv <tv@krebsco.de>2017-03-15 02:10:31 +0100
commit75040367ffe94c6c19973ccc1dd5efe24afac78d (patch)
tree1537329ddc3e2971fa4b15dbf4a5cb06b2b2f73b /tv/2configs/vim.nix
parent22daf39ce8a48d960019ca11bf1616883a104373 (diff)
tv vim: use concat
Diffstat (limited to 'tv/2configs/vim.nix')
-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