summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--makefu/1systems/pnp.nix7
-rw-r--r--makefu/2configs/tor.nix7
-rw-r--r--makefu/2configs/virtualization-virtualbox.nix18
3 files changed, 26 insertions, 6 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 2dce87d5d..497c03e11 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -9,6 +9,7 @@
[ # Include the results of the hardware scan.
# Base
../2configs/base.nix
+ ../2configs/base-sources.nix
../2configs/tinc-basic-retiolum.nix
# HW/FS
@@ -38,12 +39,6 @@
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
- krebs.build.deps = {
- nixpkgs = {
- url = https://github.com/NixOS/nixpkgs;
- rev = "03921972268934d900cc32dad253ff383926771c";
- };
- };
networking.firewall.allowedTCPPorts = [
# nginx runs on 80
diff --git a/makefu/2configs/tor.nix b/makefu/2configs/tor.nix
new file mode 100644
index 000000000..e466a1839
--- /dev/null
+++ b/makefu/2configs/tor.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+ services.tor.enable = true;
+ services.tor.client.enable = true;
+ # also enables services.tor.client.privoxy
+}
diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualization-virtualbox.nix
new file mode 100644
index 000000000..164401f77
--- /dev/null
+++ b/makefu/2configs/virtualization-virtualbox.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+ mainUser = config.krebs.build.user;
+ version = "5.0.4";
+ rev = "102546";
+ vboxguestpkg = pkgs.fetchurl {
+ url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}-${rev}.vbox-extpack";
+ sha256 = "1ykwpjvfgj11iwhx70bh2hbxhyy3hg6rnqzl4qac7xzg8xw8wqg4";
+ };
+in {
+ inherit vboxguestpkg;
+ virtualisation.virtualbox.host.enable = true;
+ nixpkgs.config.virtualbox.enableExtensionPack = true;
+
+ users.extraGroups.vboxusers.members = [ "${mainUser.name}" ];
+ environment.systemPackages = [ vboxguestpkg ];
+}