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,8 +1,5 @@
let
pkgs = import <nixpkgs> { config.android_sdk.accept_license = true; };
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
kotlinls = import ../packages/kotlin-language-server/default.nix { inherit pkgs; };
buildToolsVersion = "28.0.3";
composed = pkgs.androidenv.composeAndroidPackages {
toolsVersion = "26.1.1";
@ -24,15 +21,6 @@ let
# useGoogleTVAddOns = false;
# includeExtras = [ "extras;google;gcm" ];
};
customPlugins.kotlin-vim = pkgs.vimUtils.buildVimPlugin {
name = "kotlin-vim";
src = pkgs.fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
rev = "b9fa728701a0aa0b9a2ffe92f10880348fc27a8f";
sha256 = "1yqzxabhpc4jbdlzhsysp0vi1ayqg0vnpysvx4ynd9961q2fk3sz";
};
};
gradle-fhs-nix = pkgs.writeText "gradle-fhs.nix" ''
{ run }:
let
@ -73,31 +61,6 @@ pkgs.mkShell {
gradle-run-script
sign-release
jdk11
jdtls
(
neovim.override {
configure = {
customRC = baseVimConfig.customRC + ''
" Required for operations modifying multiple buffers like rename
set hidden
let g:LanguageClient_serverCommands = {
\ 'java': ['${jdtls}/bin/jdtls'],
\ 'kotlin': ['${kotlinls}/bin/kotlin-language-server']
\ }
'';
vam.knownPlugins = baseVimConfig.vam.knownPlugins // customPlugins;
vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
{
names = [
"kotlin-vim"
"LanguageClient-neovim"
];
}
];
};
}
)
];
shellHook = ''
export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"