move machine specific files to their own directory

flake.nix

@@ -93,14 +93,14 @@
       nixosConfigurations.basado = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./os/configuration.nix
+          ./os/basado/configuration.nix
         ];
       };
 
       nixosConfigurations.moon = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./os/moon.nix
+          ./os/moon/configuration.nix
         ];
       };
 

os/basado/configuration.nix

@@ -1,14 +1,14 @@
 { config, pkgs, ... }:
-let sshKeys = with (import ../sshKeys.nix); [
+let sshKeys = with (import ../../sshKeys.nix); [
   moon
 ];
 in
 {
   imports = [
     ./hardware-configuration.nix
-    ./common.nix
-    ./common-graphics.nix
-    (import ./remote-disk-unlock.nix sshKeys)
+    ../common.nix
+    ../common-graphics.nix
+    (import ../remote-disk-unlock.nix sshKeys)
   ];
 
   boot.loader = {

os/moon/configuration.nix

@@ -1,9 +1,9 @@
 { config, pkgs, pkgs-unstable, ... }:
 {
   imports = [ # Include the results of the hardware scan.
-    ./moon-hardware-configuration.nix
-    ./common.nix
-    ./common-graphics.nix
+    ./hardware-configuration.nix
+    ../common.nix
+    ../common-graphics.nix
   ];
 
   # Bootloader.