nixos: rename hosts to machines + minor changes

flake.nix

@@ -44,7 +44,7 @@
       "iMac-macOS" = nix-darwin.lib.darwinSystem {
         system = "x86_64-darwin";
         modules = [
-          ./hosts/darwin/imac-2017.nix
+          ./machines/darwin/imac-2017.nix
 
           home-manager.darwinModules.home-manager
           {
@@ -64,7 +64,7 @@
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          ./hosts/81fw-lenovo-legion-y7000.nix
+          ./machines/nixos/81fw-lenovo-legion-y7000.nix
 
           # Overlays
           {
@@ -133,7 +133,7 @@
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          ./hosts/imac-2017.nix
+          ./machines/nixos/imac-2017.nix
 
           home-manager.nixosModules.home-manager
           {

machines/nixos/81fw-lenovo-legion-y7000.nix

@@ -2,16 +2,16 @@
 
 {
   imports = [
-    ../nixos
+    ../../nixos
 
-    ../nixos/hardware/misc/audio.nix
+    ./hardware/misc/audio.nix
-    ../nixos/hardware/misc/bluetooth.nix
+    ./hardware/misc/bluetooth.nix
-    ../nixos/hardware/misc/opengl.nix
+    ./hardware/misc/opengl.nix
-    ../nixos/hardware/cpu/intel.nix
+    ./hardware/cpu/intel.nix
-    ../nixos/hardware/gpu/intel.nix
+    ./hardware/gpu/intel.nix
-    ../nixos/hardware/gpu/nvidia.nix
+    ./hardware/gpu/nvidia.nix
-    ../nixos/hardware/gpu/nvidia-prime.nix
+    ./hardware/gpu/nvidia-prime.nix
-    ../nixos/hardware/accessories/xbox.nix
+    ./hardware/accessories/xbox.nix
     (modulesPath + "/installer/scan/not-detected.nix") # what is this
   ];
 

machines/nixos/imac-2017.nix

@@ -2,13 +2,13 @@
 
 {
   imports = [
-    ../nixos
+    ../../nixos
 
-    ../nixos/hardware/misc/audio.nix
+    ./hardware/misc/audio.nix
-    ../nixos/hardware/misc/bluetooth.nix
+    ./hardware/misc/bluetooth.nix
-    ../nixos/hardware/misc/opengl.nix
+    ./hardware/misc/opengl.nix
-    ../nixos/hardware/cpu/intel.nix
+    ./hardware/cpu/intel.nix
-    ../nixos/hardware/gpu/amd.nix
+    ./hardware/gpu/amd.nix
     (modulesPath + "/hardware/network/broadcom-43xx.nix")
     (modulesPath + "/installer/scan/not-detected.nix") # what is this
   ];

nixos/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./boot
-    ./hardware
     ./i18n
     ./networking
     ./nix

nixos/hardware/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./hardware.nix
-  ];
-}

nixos/packages/default.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ./core.nix
+    ./hardware.nix
     ./graphical
     ./overlays
     ./unfree