tv vim: use concat
This commit is contained in:
parent
22daf39ce8
commit
75040367ff
|
@ -297,14 +297,18 @@ let {
|
||||||
alldirs = attrValues dirs ++ map dirOf (attrValues files);
|
alldirs = attrValues dirs ++ map dirOf (attrValues files);
|
||||||
in unique (sort lessThan alldirs);
|
in unique (sort lessThan alldirs);
|
||||||
|
|
||||||
vim = pkgs.writeDashBin "vim" ''
|
vim = pkgs.concat "vim" [
|
||||||
|
pkgs.vim_configurable
|
||||||
|
(pkgs.writeDashBin "vim" ''
|
||||||
set -efu
|
set -efu
|
||||||
(umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
|
(umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
|
||||||
if test $# = 0 && test -e "$PWD/.ctrlpignore"; then
|
if test $# = 0 && test -e "$PWD/.ctrlpignore"; then
|
||||||
set -- +CtrlP
|
set -- +CtrlP
|
||||||
fi
|
fi
|
||||||
exec ${pkgs.vim}/bin/vim "$@"
|
# vim-orgmode needs Python, thus vim_configurable instead of just vim
|
||||||
'';
|
exec ${pkgs.vim_configurable}/bin/vim "$@"
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
|
||||||
vimrc = pkgs.writeText "vimrc" ''
|
vimrc = pkgs.writeText "vimrc" ''
|
||||||
set nocompatible
|
set nocompatible
|
||||||
|
|
Loading…
Reference in New Issue
Block a user