steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

pkgs: use master virtmanager and cleanup neovim

Browse source
This commit is contained in:
steveej 2016-04-25 00:24:24 +02:00
parent 829bc7e6f1
commit 35c809f61a
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
configuration/common/pkg/neovim.nix
View file

@ -1,10 +1,10 @@
{ config, pkgs, ... }:
let
gitpkgs = import <gitpkgs> {};
commonPkgs = with pkgs; [
neovim
xsel
];
goPkgs = with pkgs.goPackages; [
goPkgs = with gitpkgs.go16Packages; [
go
tools.bin
godef.bin
@ -20,8 +20,8 @@ let
];
in {
nixpkgs.config.packageOverrides = pkgs: {
neovim = pkgs.neovim.override {
environment.systemPackages = commonPkgs ++ goPkgs ++ pythonPkgs ++ [
(pkgs.neovim.override {
vimAlias = true;
configure = {
# add custom .vimrc lines like this:
@ -171,7 +171,7 @@ in {
" }}}
'';
# vam.knownPlugins = pkgs.vimPlugins; # optional
vam.knownPlugins = gitpkgs.vimPlugins; # optional
vam.pluginDictionaries = [ # full ducomentation at github.com/MarcWeber/vim-addon-manager
"vim-addon-vim2nix"
"youcompleteme"
@ -192,14 +192,13 @@ in {
"vimpreviewpandoc"
];
};
extraPythonPackages = with pkgs.python2Packages; [
extraPythonPackages = with gitpkgs.python2Packages; [
pandocfilters
htmltreediff
html5lib
dbus
] ++ pythonPkgs;
withPython3 = false;
};
};
environment.systemPackages = commonPkgs ++ goPkgs ++ pythonPkgs;
})
];
}