diff options
author | nin <nin@c-base.org> | 2018-02-27 22:30:49 +0100 |
---|---|---|
committer | nin <nin@c-base.org> | 2018-02-27 22:30:49 +0100 |
commit | 01289f333143fa145fe585812d05672efd3f3ebe (patch) | |
tree | d6de52e9914cd6489cbad61ae7c6fb60ad472c41 /makefu/1systems/sdev/config.nix | |
parent | f20bf1a7ba146b3ffe3f2e470614d12885cbce61 (diff) | |
parent | 9e67031cb878c0bcdcde39a7b7b746111de6719a (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/sdev/config.nix')
-rw-r--r-- | makefu/1systems/sdev/config.nix | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 38c044be..c2cd23d1 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -5,32 +5,35 @@ imports = [ # Include the results of the hardware scan. <stockholm/makefu> - (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) - (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) + + # <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" '' @@ -39,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" ]; - }; } |