summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/vbob
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-02-14 09:41:59 +0100
committermakefu <github@syntax-fehler.de>2018-02-14 09:41:59 +0100
commit931e25894dc43f7c7e37026f3cc29427aa07ba80 (patch)
tree2d52d792e1f3d96c2e9e832f227c87640117840b /makefu/1systems/vbob
parent372d965133cfe224d4cd47f63ec1fd2c8475c1ae (diff)
ma vbox-guest: init
Diffstat (limited to 'makefu/1systems/vbob')
-rw-r--r--makefu/1systems/vbob/config.nix40
1 files changed, 4 insertions, 36 deletions
diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index 24d42a69b..c74f6edbe 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -9,33 +9,8 @@
imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
boot.loader.grub.device = "/dev/sda";
}
-
- { ## Virtualbox guest is broken on newer kernel
- # virtualisation.virtualbox.guest.enable = true;
- }
-
- # {
- # imports = [
- # <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
- # ];
- # virtualbox.baseImageSize = 35 * 1024;
- # fileSystems."/media/share" = {
- # fsType = "vboxsf";
- # device = "share";
- # options = [ "rw" "uid=9001" "gid=9001" ];
- # };
- # }
-
- # {
- # imports = [
- # <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
- # ];
- # fileSystems."/nix" = {
- # device ="/dev/disk/by-label/nixstore";
- # fsType = "ext4";
- # };
- # }
-
+ <stockholm/makefu/2configs/hw/vbox-guest.nix>
+ # <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
# base gui
# <stockholm/makefu/2configs/main-laptop.nix>
@@ -79,14 +54,8 @@
];
networking.extraHosts = import (toString <secrets/extra-hosts.nix>);
- nixpkgs.config.allowUnfree = true;
-
# allow vbob to deploy self
- users.extraUsers = {
- root = {
- openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey ];
- };
- };
+ users.extraUsers.root.openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey ];
environment.shellAliases = {
forti = "cat ~/vpn/pw.txt | xclip; sudo forticlientsslvpn";
@@ -107,7 +76,6 @@
#devpi-client
ansible
];
- # virtualisation.docker.enable = true;
networking.firewall.allowedTCPPorts = [
@@ -115,6 +83,6 @@
80
8010
];
-
+ # required for qemu
systemd.services."serial-getty@ttyS0".enable = true;
}