chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of project-specific vim

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

30
shells/dodona.nix
View file

@ -1,7 +1,5 @@
let
pkgs = import <nixpkgs> { };
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
nodePackages = import ../packages/node/default.nix { inherit pkgs; };
in
pkgs.mkShell {
buildInputs = with pkgs; [
@ -13,7 +11,7 @@ pkgs.mkShell {
zlib
(
pkgs.writeScriptBin "start-db" ''
#!${pkgs.zsh}/bin/zsh
#!${zsh}/bin/zsh
trap "docker stop dodona-db" 0
trap "docker stop dodona-cache" 0
@ -25,32 +23,6 @@ pkgs.mkShell {
wait $child
''
)
(
neovim.override {
configure = {
customRC = baseVimConfig.customRC + ''
" Required for operations modifying multiple buffers like rename
set hidden
let g:LanguageClient_serverCommands = {
\ 'ruby': ['${solargraph}/bin/solargraph', 'stdio'],
\ 'javascript': ['${nodePackages.javascript-typescript-langserver}/bin/javascript-typescript-stdio'],
\ 'typescript': ['${nodePackages.typescript-language-server}/bin/typescript-language-server', '--stdio'],
\ }
'';
vam.knownPlugins = baseVimConfig.vam.knownPlugins;
vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
{
names = [
"LanguageClient-neovim"
"vim-ruby"
"yats-vim"
];
}
];
};
}
)
];
shellHook = ''
export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"