diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-26 18:54:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 18:54:44 +0000 |
| commit | 7525d5acd369ac7bf44923dd0af6d82591ad98ca (patch) | |
| tree | 947ed8e7242f51563c702d371474d0ef8d0cc2bd /pkgs/test | |
| parent | f8a73160e3af93283cf353a4adec70b3f2438bf1 (diff) | |
| parent | 0e7ab2d48d4d49a244adf02267f5ace3df2039b3 (diff) | |
| download | nixpkgs-7525d5acd369ac7bf44923dd0af6d82591ad98ca.tar nixpkgs-7525d5acd369ac7bf44923dd0af6d82591ad98ca.tar.gz nixpkgs-7525d5acd369ac7bf44923dd0af6d82591ad98ca.tar.bz2 nixpkgs-7525d5acd369ac7bf44923dd0af6d82591ad98ca.tar.lz nixpkgs-7525d5acd369ac7bf44923dd0af6d82591ad98ca.tar.xz nixpkgs-7525d5acd369ac7bf44923dd0af6d82591ad98ca.tar.zst nixpkgs-7525d5acd369ac7bf44923dd0af6d82591ad98ca.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/vim/default.nix | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 4ca004a60c3..c75836aa9a8 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,14 +1,43 @@ -{ vimUtils, vim_configurable, neovim, vimPlugins -, lib, fetchFromGitHub, +{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable +, neovim-unwrapped }: let inherit (vimUtils) buildVimPluginFrom2Nix; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; + + plugins = with vimPlugins; [ + { + plugin = vim-obsession; + config = '' + map <Leader>$ <Cmd>Obsession<CR> + ''; + } + ]; + + nvimConfNix = neovimUtils.makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + wrapNeovim = suffix: config: + wrapNeovimUnstable neovim-unwrapped (config // { + extraName = suffix; + wrapRc = true; + }); in { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; + ### neovim tests + ################## + nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + + ### vim tests + ################## vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; |