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

19
configuration/steveej-laptop/pkg.nix
View file

@ -1,9 +1,11 @@
{ config, pkgs, ... }: { config,
pkgs,
... }:
let let
gitpkgs = import <gitpkgs> {}; gitpkgs = import <gitpkgs> {};
in
in { {
nixpkgs.config = { nixpkgs.config = {
allowBroken = false; allowBroken = false;
@ -11,6 +13,7 @@ in {
goPackages = pkgs.go16Packages; goPackages = pkgs.go16Packages;
bluez = pkgs.bluez5; bluez = pkgs.bluez5;
linuxPackages = pkgs.linuxPackages_latest; linuxPackages = pkgs.linuxPackages_latest;
#pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; };
}; };
allowUnfree = true; allowUnfree = true;
@ -40,10 +43,9 @@ in {
imports = imports =
[ [
../common/pkg/default.nix ../common/pkg/default.nix
(import ../common/pkg/neovim.nix { inherit config; pkgs = gitpkgs; }) ../common/pkg/neovim.nix
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
androidsdk_4_4 androidsdk_4_4
@ -61,6 +63,7 @@ in {
firefox-wrapper firefox-wrapper
chromium chromium
qpdfview qpdfview
thunderbird thunderbird
pidgin pidgin
@ -70,9 +73,9 @@ in {
x2goclient x2goclient
remmina remmina
teamviewer teamviewer
gnome3.dconf # needed by virtmanager
virtmanager
x11_ssh_askpass x11_ssh_askpass
gnome3.dconf # needed by virtmanager
#virtmanager
spotify spotify
vlc vlc
@ -92,6 +95,6 @@ in {
pythonFull pythonFull
] ++ [ ] ++ [
gitpkgs.rkt gitpkgs.rkt
gitpkgs.virtmanager
]; ];
} }