From 397a1c89319cce2c0f37ef5eb308e40954727108 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 14 Feb 2018 01:32:22 +0100
Subject: ma {vbob,sdev}.r: disable vbox guest extensions for now

---
 makefu/1systems/vbob/config.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems/vbob')

diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index ffd9deaee..24d42a69b 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -8,8 +8,12 @@
       {
         imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
         boot.loader.grub.device = "/dev/sda";
-        virtualisation.virtualbox.guest.enable = true;
       }
+
+      { ## Virtualbox guest is broken on newer kernel
+        # virtualisation.virtualbox.guest.enable = true;
+      }
+
       # {
       #   imports = [
       #     <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
-- 
cgit v1.2.3


From 931e25894dc43f7c7e37026f3cc29427aa07ba80 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 14 Feb 2018 09:41:59 +0100
Subject: ma vbox-guest: init

---
 makefu/1systems/vbob/config.nix | 40 ++++------------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'makefu/1systems/vbob')

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;
 }
-- 
cgit v1.2.3


From cd31fcaefa6349248bd1a437027e83c7e05b22af Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 14 Feb 2018 09:49:57 +0100
Subject: ma docker: use 2configs

---
 makefu/1systems/vbob/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'makefu/1systems/vbob')

diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index c74f6edbe..1f68ad9c2 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -71,7 +71,6 @@
     fortclientsslvpn ppp xclip
     get
     logstash
-  #  docker
     #devpi-web
     #devpi-client
     ansible
-- 
cgit v1.2.3


From cdf69ce25896caf40932c0389b33b2fa9c3ab77a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 16 Feb 2018 20:48:56 +0100
Subject: ma vbox-guest: remove from vhosts, prepare for working upstream

---
 makefu/1systems/vbob/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/1systems/vbob')

diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index 1f68ad9c2..64709de3c 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -9,7 +9,7 @@
         imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
         boot.loader.grub.device = "/dev/sda";
       }
-      <stockholm/makefu/2configs/hw/vbox-guest.nix>
+      # <stockholm/makefu/2configs/hw/vbox-guest.nix>
       # <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
 
       # base gui
-- 
cgit v1.2.3


From b28b86580d22e67d9a0552e96841643f77e03927 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 16 Feb 2018 21:57:05 +0100
Subject: ma sdev.,vbob.r: allow unfree

---
 makefu/1systems/vbob/config.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'makefu/1systems/vbob')

diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index 64709de3c..208dd1ff7 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -67,6 +67,10 @@
     ln -fs ${pkgs.ppp}/bin/pppd /usr/sbin/pppd
     ln -fs ${pkgs.coreutils}/bin/tail /usr/bin/tail
   '';
+
+  # for forticlient
+  nixpkgs.config.allowUnfree = true;
+
   environment.systemPackages = with pkgs;[
     fortclientsslvpn ppp xclip
     get
-- 
cgit v1.2.3