From 397a1c89319cce2c0f37ef5eb308e40954727108 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 14 Feb 2018 01:32:22 +0100 Subject: ma {vbob,sdev}.r: disable vbox guest extensions for now --- makefu/1systems/sdev/config.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'makefu/1systems/sdev/config.nix') diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 38c044be4..3e9548aa1 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -6,7 +6,9 @@ [ # Include the results of the hardware scan. (toString ) - (toString ) + { ## Guest Extensions are currently broken + # virtualisation.virtualbox.guest.enable = true; + } # @@ -50,7 +52,7 @@ fileSystems."/media/share" = { fsType = "vboxsf"; device = "share"; - options = [ "rw" "uid=9001" "gid=9001" ]; + options = [ "rw" "uid=9001" "gid=9001" "nofail" ]; }; } -- cgit v1.2.3 From 372d965133cfe224d4cd47f63ec1fd2c8475c1ae Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 14 Feb 2018 08:37:59 +0100 Subject: ma sdev.r: force virtualisation.virtualbox.guest.enable = false --- makefu/1systems/sdev/config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'makefu/1systems/sdev/config.nix') diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 3e9548aa1..a60a8db66 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -5,9 +5,10 @@ imports = [ # Include the results of the hardware scan. + (toString ) { ## Guest Extensions are currently broken - # virtualisation.virtualbox.guest.enable = true; + virtualisation.virtualbox.guest.enable = lib.mkForce true; } # -- cgit v1.2.3 From 931e25894dc43f7c7e37026f3cc29427aa07ba80 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 14 Feb 2018 09:41:59 +0100 Subject: ma vbox-guest: init --- makefu/1systems/sdev/config.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'makefu/1systems/sdev/config.nix') diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index a60a8db66..81e8cd4d1 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -6,9 +6,12 @@ [ # Include the results of the hardware scan. - (toString ) - { ## Guest Extensions are currently broken - virtualisation.virtualbox.guest.enable = lib.mkForce true; + + { # until virtualbox-image is fixed + imports = [ + + ]; + boot.loader.grub.device = "/dev/sda"; } # @@ -17,11 +20,6 @@ ]; - # 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 = { @@ -50,10 +48,5 @@ 8010 ]; - fileSystems."/media/share" = { - fsType = "vboxsf"; - device = "share"; - options = [ "rw" "uid=9001" "gid=9001" "nofail" ]; - }; } -- cgit v1.2.3 From cd31fcaefa6349248bd1a437027e83c7e05b22af Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 14 Feb 2018 09:49:57 +0100 Subject: ma docker: use 2configs --- makefu/1systems/sdev/config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'makefu/1systems/sdev/config.nix') diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 81e8cd4d1..7a87362d8 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -18,6 +18,7 @@ # environment + ]; # allow sdev to deploy self @@ -31,7 +32,6 @@ ppp xclip get passwdqc-utils - docker gnupg populate (pkgs.writeScriptBin "tor-browser" '' @@ -40,8 +40,6 @@ '') ]; - virtualisation.docker.enable = true; - networking.firewall.allowedTCPPorts = [ 25 80 -- cgit v1.2.3 From cdf69ce25896caf40932c0389b33b2fa9c3ab77a Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 16 Feb 2018 20:48:56 +0100 Subject: ma vbox-guest: remove from vhosts, prepare for working upstream --- makefu/1systems/sdev/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/1systems/sdev/config.nix') diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 7a87362d8..d209a0781 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -6,7 +6,7 @@ [ # Include the results of the hardware scan. - + # { # until virtualbox-image is fixed imports = [ -- cgit v1.2.3 From b28b86580d22e67d9a0552e96841643f77e03927 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 16 Feb 2018 21:57:05 +0100 Subject: ma sdev.,vbob.r: allow unfree --- makefu/1systems/sdev/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'makefu/1systems/sdev/config.nix') diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index d209a0781..c2cd23d1e 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -27,6 +27,8 @@ openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey ]; }; }; + # corefonts + nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs;[ ppp xclip -- cgit v1.2.3