From 7f8ba9ae559eba9ca8b2b2de69577876435943ed Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 20 Nov 2018 22:40:13 +0100
Subject: [PATCH] update for local environment

---
 conf               | 2 +-
 logical/jarvis.nix | 1 -
 roles/default.nix  | 1 -
 servers.json       | 6 +++---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf b/conf
index e907540..8d8301a 100755
--- a/conf
+++ b/conf
@@ -15,7 +15,7 @@ function get_channel {
             echo "nixpkgs=https://nixos.org/channels/nixos-18.03/nixexprs.tar.xz"
 	          ;;
         checkout)
-            echo "nixpkgs=$PWD/../nixpkgs"
+            echo "nixpkgs=$PWD/../projects/nixpkgs"
             ;;
         channel)
 	          echo "/nix/var/nix/profiles/per-user/root/channels/nixos"
diff --git a/logical/jarvis.nix b/logical/jarvis.nix
index 7bcd0c7..2f715be 100644
--- a/logical/jarvis.nix
+++ b/logical/jarvis.nix
@@ -12,5 +12,4 @@
   services.xserver.displayManager.sessionCommands = ''
     ${pkgs.xorg.xrandr}/bin/xrandr --dpi 192
   '';
-  virtualisation.virtualbox.host.enable = pkgs.lib.mkOverride 30 false;
 }
diff --git a/roles/default.nix b/roles/default.nix
index 8dd936b..2ef35bc 100644
--- a/roles/default.nix
+++ b/roles/default.nix
@@ -31,7 +31,6 @@ in
 
   # Nix
   nixpkgs.config.allowUnfree = true;
-  nix.package = pkgs.nixUnstable;
   nixpkgs.overlays = import ../packages;
 
   nix.buildCores = config.nix.maxJobs;
diff --git a/servers.json b/servers.json
index 7b94c9e..4bfcb6d 100644
--- a/servers.json
+++ b/servers.json
@@ -4,16 +4,16 @@
         "host": "pennyworth.yori.cc"
     },
     "jarvis": {
-        "pkgs": "channel",
+        "pkgs": "checkout",
         "host": "localhost"
     },
     "ascanius": {
         "pkgs": "channel",
-        "host": "localhost"
+        "host": "ascanius.home.yori.cc"
     },
     "woodhouse": {
         "pkgs": "channel",
-        "host": "192.168.1.9"
+        "host": "woodhouse.home.yori.cc"
     },
     "frumar": {
         "pkgs": "channel",