Separate hosts for X220 and T430, generic VirtualBox host

hosts/default.nix

@@ -9,13 +9,20 @@ let
   lib = nixpkgs.lib;
 in
 {
-  elnupad = lib.nixosSystem {
+  x220 = lib.nixosSystem {
     inherit system;
     specialArgs = { inherit user; };
     modules = [
-      ./elnupad
+      ./thinkpads
       ./configuration.nix
       ./desktop.nix
+      {
+        # 1024x768 is the closest supported resolution to X220's native 1366x768
+        # To see a list of supported GRUB resolutions, enter GRUB,
+        # press e, F2 to enter command mode, and then type videoinfo to see list
+        boot.loader.grub.gfxmodeEfi = "1024x768";
+        networking.hostName = "x220";
+      }
       home-manager.nixosModules.home-manager {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
@@ -23,7 +30,34 @@ in
         home-manager.users.${user} = {
           imports = [
             (import ./home.nix)
-            (import ./elnupad/home.nix)
+            (import ./thinkpads/home.nix)
+          ];
+        };
+      }
+    ];
+  };
+
+  t430 = lib.nixosSystem {
+    inherit system;
+    specialArgs = { inherit user; };
+    modules = [
+      ./thinkpads
+      ./configuration.nix
+      ./desktop.nix
+      {
+        boot.loader.grub.gfxmodeEfi = "1600x900";
+        networking.hostName = "t430";
+      }
+      home-manager.nixosModules.home-manager {
+        home-manager = {
+          useGlobalPkgs = true;
+        };
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+          imports = [
+            (import ./home.nix)
+            (import ./thinkpads/home.nix)
           ];
         };
       }
@@ -37,6 +71,9 @@ in
       ./virtualbox
       ./configuration.nix
       ./desktop.nix
+      {
+        networking.hostName = "virtualbox";
+      }
       home-manager.nixosModules.home-manager {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;

hosts/thinkpads/default.nix

@@ -11,17 +11,9 @@
     grub = {
       efiSupport = true;
       device = "nodev";
-      # 1024x768 is the closest supported resolution to X220's native 1366x768
-      # To see a list of supported GRUB resolutions, enter GRUB,
-      # press e, F2 to enter command mode, and then type videoinfo to see list
-      gfxmodeEfi = "1024x768";
     };
   };
 
-  networking.hostName = "elnupad";
-
-  time.timeZone = "America/Los_Angeles";
-
   # Use X11 caps lock to escape remap in TTY
   console.useXkbConfig = true;
   services.xserver.xkbOptions = "caps:escape";

hosts/virtualbox/default.nix

@@ -7,6 +7,4 @@
     enable = true;
     device = "/dev/sda";
   };
-
-  networking.hostName = "virtualbox";
 }