diff options
| author | makefu <github@syntax-fehler.de> | 2017-03-16 23:28:32 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-03-16 23:28:32 +0100 |
| commit | 4b29caff2681d21ce4be687321fa4ab2f7713cd4 (patch) | |
| tree | c0f59f1eafd87863173a957da3d5b79d69102b83 /tv/2configs/vim.nix | |
| parent | 6ec1a6296930569c97cf029bad17c998d4fae66d (diff) | |
| parent | 8809797f1063945c03ebd70666c108c45d5d724a (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs/vim.nix')
| -rw-r--r-- | tv/2configs/vim.nix | 20 |
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 |