Get rid of project-specific vim

This commit is contained in:
Charlotte Van Petegem 2020-05-06 15:23:19 +02:00
parent 1afb00a3de
commit 0459c372a0
9 changed files with 182 additions and 317 deletions

View file

@ -1,7 +1,6 @@
let
pkgs = import <nixpkgs> { };
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
baseVimConfig = import ../configurations/neovim/base.nix { inherit pkgs; };
extraRpath = pkgs.stdenv.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg ]);
in
pkgs.mkShell {
@ -15,40 +14,6 @@ pkgs.mkShell {
''
)
jdk11
jdtls
openjfx11
(
pkgs.writeScriptBin "pmd" ''
#!${pkgs.zsh}/bin/zsh
${pkgs.pmd}/bin/run.sh pmd $@
''
)
(
neovim.override {
configure = {
customRC = baseVimConfig.customRC + ''
" Required for operations modifying multiple buffers like rename
set hidden
let g:LanguageClient_serverCommands = {
\ 'java': ['${jdtls}/bin/jdtls'],
\ }
let g:ale_linters = {
\ 'java': ['pmd'],
\}
'';
vam.knownPlugins = baseVimConfig.vam.knownPlugins;
vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
{
names = [
"LanguageClient-neovim"
];
}
];
};
}
)
];
}