Merge branch 'master' of ssh://git.ingolf-wagner.de:443/palo/nixos-config

This commit is contained in:
Ingolf Wagner 2020-04-08 00:25:09 +02:00
commit 8d9cdf514c
Signed by: palo
GPG key ID: 76BF5F1928B9618B
2 changed files with 9 additions and 9 deletions

View file

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/NixOS/nixpkgs-channels.git", "url": "https://github.com/NixOS/nixpkgs-channels.git",
"rev": "6d445f8398d2d585d20d9acacf00fd9d15081b3b", "rev": "e10c65cdb35b6a66491e47e5a85f5d456b4f4eea",
"date": "2020-03-30T15:51:38-04:00", "date": "2020-04-05T01:34:21+02:00",
"sha256": "1ajd0zr31iny3g9hp0pc1y2pxcm3nakdv6260lnvyn0k4vygync2", "sha256": "19csb2s3wyav83zcw9dw488zk2fnz6wcxxz8q6hy43dbph86hxwm",
"fetchSubmodules": false "fetchSubmodules": false
} }

View file

@ -4,9 +4,9 @@
<system/desktop> <system/desktop>
./hardware-configuration.nix ./hardware-configuration.nix
./kibana.nix #./kibana.nix
./packages.nix ./packages.nix
./slack.nix #./slack.nix
./syncthing.nix ./syncthing.nix
./tinc.nix ./tinc.nix
@ -42,11 +42,11 @@
services.printing.enable = true; services.printing.enable = true;
virtualisation = { virtualisation = {
docker.enable = true; docker.enable = false;
virtualbox = { virtualbox = {
host.enable = true; host.enable = false;
guest.x11 = true; guest.x11 = false;
guest.enable = true; guest.enable = false;
}; };
}; };