3 files changed, 12 insertions, 15 deletions
diff --git a/machines/hp-compaq/configuration.nix b/machines/hp-compaq/configuration.nix
index 958088c..cc61647 100755
--- a/machines/hp-compaq/configuration.nix
+++ b/machines/hp-compaq/configuration.nix
@@ -1,22 +1,16 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
+  imports = [
+	../base.nix
+	../pl.nix
+	../../modules/larbs.nix
+  ];
 
   networking.hostName = "hp-compaq";
 
-  networking.useDHCP = false;
-  networking.interfaces.enp2s0.useDHCP = true;
-
   environment.systemPackages = with pkgs; [
   ];
-
 }
 
diff --git a/machines/hp-compaq/default.nix b/machines/hp-compaq/default.nix
index 2b96276..246ffea 100755
--- a/machines/hp-compaq/default.nix
+++ b/machines/hp-compaq/default.nix
@@ -2,9 +2,5 @@
 	imports = [
 		./configuration.nix
 		./hardware-configuration.nix
-
-		../base.nix
-		../pl.nix
-		../../modules/larbs.nix
 	];
 }
diff --git a/machines/hp-compaq/hardware-configuration.nix b/machines/hp-compaq/hardware-configuration.nix
index a2f8180..6971c39 100755
--- a/machines/hp-compaq/hardware-configuration.nix
+++ b/machines/hp-compaq/hardware-configuration.nix
@@ -13,6 +13,13 @@
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
+
+  networking.useDHCP = false;
+  networking.interfaces.enp2s0.useDHCP = true;
+
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/ad2775d5-5890-493e-b709-60c1f7f3c63b";
       fsType = "ext4";