Merge branch 'pr/bump' into 'master'

Pr/bump

See merge request steveeJ/infra!28
This commit is contained in:
steveej 2019-12-10 17:33:27 +00:00
commit 6ae18f8dd6
3 changed files with 11 additions and 6 deletions

View file

@ -5,4 +5,5 @@
{ {
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-fullblown.nix; home-manager.users.steveej = import ../../../home-manager/configuration/graphical-fullblown.nix;
services.teamviewer.enable = true; services.teamviewer.enable = true;
system.stateVersion = "19.09";
} }

View file

@ -63,8 +63,12 @@ in {
tcp_port = "16509" tcp_port = "16509"
''; '';
}; };
virtualbox.host.enable = true;
virtualbox.host.addNetworkInterface = true; virtualbox.host = {
enable = false ;
addNetworkInterface = false;
};
docker = { docker = {
enable = true; enable = true;
extraOptions = "--experimental"; extraOptions = "--experimental";

View file

@ -1,20 +1,20 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-19.09"; ref = "nixos-19.09";
rev = "e6d584f6dd22b587d5cdf5019f5e7dd2be370f61"; rev = "3a1861fcabcdf08a0c369e49b48675242ceb3aa2";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "41d921292e922a6cd1aba64259341c244d4c2cc7"; rev = "3140fa89c51233397f496f49014f6b23216667c2";
}; };
nixpkgsMaster = { nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "a6934e36534f8a87a78f877eee65c08fa9867ba5"; rev = "2ac6f1e3524b310bf94eba6ace6f9a75c9835dec";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "master"; ref = "master";
rev = "286dd9b3088298e5a4625b517f8e72b1c62e4f74"; rev = "621c98f15a31e7f0c1389f69aaacd0ac267ce29e";
}; };
} }