From cb6106fe864dcc98a894b0ec1a11340756a42f34 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 31 Aug 2016 17:44:04 +0200
Subject: [PATCH] *: refactor & cleanup

---
 configuration/steveej-laptop/configuration.nix | 6 +++---
 configuration/steveej-laptop/pkg.nix           | 9 +++++----
 configuration/steveej-laptop/system.nix        | 6 ++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/configuration/steveej-laptop/configuration.nix b/configuration/steveej-laptop/configuration.nix
index 285594a..b49f937 100644
--- a/configuration/steveej-laptop/configuration.nix
+++ b/configuration/steveej-laptop/configuration.nix
@@ -6,10 +6,10 @@
 
 {
   imports = [ 
-    ./hw.nix
-    ./boot.nix
-    ./system.nix
     ./pkg.nix
+    ./hw.nix
+    ./system.nix
     ./user.nix
+    ./boot.nix
   ];
 }
diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix
index 3072537..dbafe00 100644
--- a/configuration/steveej-laptop/pkg.nix
+++ b/configuration/steveej-laptop/pkg.nix
@@ -104,21 +104,22 @@ in
 
     gnupg
     picocom
-    xfce.terminal
+    roxterm
     xorg.xbacklight
     coreutils
     lsof
 
     xscreensaver
-    firefox-wrapper
     chromium
+    firefox-wrapper
     seafile-client
 
     qpdfview
     thunderbird
+    keepass
+
     pidgin
     hexchat
-    keepass
     skype
 
     teamviewer
@@ -143,7 +144,7 @@ in
 
     #pandoc
     pythonFull
-  ] ++ [
+
     gitpkgs.rkt
     gitpkgs.flannel
     gitpkgs.remmina
diff --git a/configuration/steveej-laptop/system.nix b/configuration/steveej-laptop/system.nix
index a24bf4c..fc6748e 100644
--- a/configuration/steveej-laptop/system.nix
+++ b/configuration/steveej-laptop/system.nix
@@ -167,10 +167,8 @@
   # virtualization
   virtualisation = {
     libvirtd.enable = true;
-    virtualbox = {
-      host.enable = true;
-      host.addNetworkInterface = true;
-    };
+    virtualbox.host.enable = true;
+    virtualbox.host.addNetworkInterface = true;
   };
 
   system.activationScripts.bin = ''