From a73e4ab2a9d6e419c001496b5082ef410e2584c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 30 Jun 2019 13:59:03 +0100
Subject: [PATCH] Add nixos vm config

---
 nixos/boxes/skinnyv.nix |  8 ++++++--
 nixos/boxes/thinky.nix  |  6 +++++-
 nixos/boxes/vm.nix      | 13 +++++++++++++
 nixos/common.nix        |  3 ---
 nixos/vscode.nix        |  8 +-------
 5 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 nixos/boxes/vm.nix

diff --git a/nixos/boxes/skinnyv.nix b/nixos/boxes/skinnyv.nix
index ae872493..77425245 100644
--- a/nixos/boxes/skinnyv.nix
+++ b/nixos/boxes/skinnyv.nix
@@ -26,5 +26,9 @@
     enableHardening = false; #needed for 3D acceleration
   };
 
-  imports = [ ../common.nix ];
-}
\ No newline at end of file
+  imports = [
+    /etc/nixos/hardware-configuration.nix
+    ../boot.nix
+    ../common.nix 
+  ];
+}
diff --git a/nixos/boxes/thinky.nix b/nixos/boxes/thinky.nix
index 43b719d7..d04bcc3f 100644
--- a/nixos/boxes/thinky.nix
+++ b/nixos/boxes/thinky.nix
@@ -15,5 +15,9 @@
     };
   };
   time.timeZone = "Europe/Warsaw";
-  imports = [ ../common.nix ];
+  imports = [
+    /etc/nixos/hardware-configuration.nix
+    ../boot.nix
+    ../common.nix 
+  ];
 }
diff --git a/nixos/boxes/vm.nix b/nixos/boxes/vm.nix
new file mode 100644
index 00000000..85e694ef
--- /dev/null
+++ b/nixos/boxes/vm.nix
@@ -0,0 +1,13 @@
+
+{ config, pkgs, lib, ... }:
+{
+  time.timeZone = "Europe/London";
+
+  services.xserver.desktopManager.plasma5.enable = lib.mkForce false;
+  services.xserver.displayManager.sddm.enable = lib.mkForce false;
+
+  imports = [ 
+    <nixpkgs/nixos/modules/installer/virtualbox-demo.nix>
+    ../common.nix
+  ];
+}
diff --git a/nixos/common.nix b/nixos/common.nix
index 7a52866d..e76cdc5a 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -7,12 +7,10 @@ in
 {
   imports =
     [
-      /etc/nixos/hardware-configuration.nix
       ./vscode.nix
       ./syncthing.nix
       ./gsconnect.nix
       ./gfx.nix
-      ./boot.nix
     ];
 
   nixpkgs.config = {
@@ -51,7 +49,6 @@ in
         yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt
         mono calcurse unstable.pypi2nix etesync-dav calibre fbreader unstable.hopper file python37Packages.binwalk-full
       ];
-    uid = 1000;
     shell = pkgs.zsh;
   };
 
diff --git a/nixos/vscode.nix b/nixos/vscode.nix
index 32b28dc9..436a6bc0 100644
--- a/nixos/vscode.nix
+++ b/nixos/vscode.nix
@@ -127,12 +127,6 @@ in
             sha256 = "1lccsyhj3mgbacw76hikgml85hi82zipaza1194nqnj1inhci80b";
             }
             {
-            publisher = "PeterJausovec";
-            name = "vscode-docker";
-            version = "0.6.1";
-            sha256 = "0clxy66qi5c3k5di5xsjm3vjib525xq89z1q2h3a5x5qwvbvd0mj";
-            }
-            {
             publisher = "ritwickdey";
             name = "LiveServer";
             version = "5.6.1";
@@ -159,4 +153,4 @@ in
         ];})
       ];
   };
-}
\ No newline at end of file
+}