summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/sdev/config.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-02-16 22:40:19 +0100
committerlassulus <lassulus@lassul.us>2018-02-16 22:40:19 +0100
commite6486980dd1821d62aae4015092c7e719b23622b (patch)
tree5882176d32591e96269f18e5f14543da02427c74 /makefu/1systems/sdev/config.nix
parent5187d0177c2c347838bac00fa981703bfd9a983e (diff)
parentb28b86580d22e67d9a0552e96841643f77e03927 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/sdev/config.nix')
-rw-r--r--makefu/1systems/sdev/config.nix25
1 files changed, 9 insertions, 16 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index a60a8db66..c2cd23d1e 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,34 +6,34 @@
[ # Include the results of the hardware scan.
<stockholm/makefu>
- (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
- { ## Guest Extensions are currently broken
- virtualisation.virtualbox.guest.enable = lib.mkForce true;
+ # <stockholm/makefu/2configs/hw/vbox-guest.nix>
+ { # until virtualbox-image is fixed
+ imports = [
+ <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+ ];
+ boot.loader.grub.device = "/dev/sda";
}
<stockholm/makefu/2configs/main-laptop.nix>
# <secrets/extra-hosts.nix>
# environment
<stockholm/makefu/2configs/tinc/retiolum.nix>
+ <stockholm/makefu/2configs/virtualisation/docker.nix>
];
- # workaround for https://github.com/NixOS/nixpkgs/issues/16641
- services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ];
-
- nixpkgs.config.allowUnfree = true;
-
# allow sdev to deploy self
users.extraUsers = {
root = {
openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey ];
};
};
+ # corefonts
+ nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs;[
ppp xclip
get
passwdqc-utils
- docker
gnupg
populate
(pkgs.writeScriptBin "tor-browser" ''
@@ -42,18 +42,11 @@
'')
];
- virtualisation.docker.enable = true;
-
networking.firewall.allowedTCPPorts = [
25
80
8010
];
- fileSystems."/media/share" = {
- fsType = "vboxsf";
- device = "share";
- options = [ "rw" "uid=9001" "gid=9001" "nofail" ];
- };
}