some file reordering

common/desktop/drivers/skynet.nix

@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  hardware.opengl.extraPackages = with pkgs; [
-    intel-compute-runtime
-    mesa_drivers
-    vaapiIntel
-    vaapiVdpau
-    libvdpau-va-gl
-    intel-media-driver
-  ];
-}

devices/common-mbr.nix

@@ -1,22 +0,0 @@
-{pkgs, ...}: {
-  boot = {
-    loader = {
-      grub = {
-        enable = true;
-        device = "/dev/sda";
-        useOSProber = true;
-      };
-    };
-    kernelPackages = pkgs.linuxPackages_latest;
-  };
-
-  hardware = {
-    xpadneo.enable = true;
-  };
-
-  time.timeZone = "America/Los_Angeles";
-
-  zramSwap.enable = true;
-
-  system.stateVersion = "23.05";
-}

devices/crystal-gitlab/base.nix

@@ -23,6 +23,22 @@
     };
   };
 
+  boot = {
+    loader = {
+      grub = {
+        enable = true;
+        device = "/dev/sda";
+      };
+    };
+    kernelPackages = pkgs.linuxPackages_latest;
+  };
+
+  time.timeZone = "America/Los_Angeles";
+
+  zramSwap.enable = true;
+
+  system.stateVersion = "23.05";
+
   networking.hostName = "crystal-gitlab";
   networking.useDHCP = true;
   nixpkgs.hostPlatform = "x86_64-linux";

devices/skynet/base.nix

@@ -25,6 +25,14 @@
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.intel.updateMicrocode = true;
   hardware.sensor.iio.enable = true;
+  hardware.opengl.extraPackages = with pkgs; [
+    intel-compute-runtime
+    mesa_drivers
+    vaapiIntel
+    vaapiVdpau
+    libvdpau-va-gl
+    intel-media-driver
+  ];
 
   boot = {
     initrd = {

flake.nix

@@ -58,12 +58,7 @@
         common = [
           ./common/personal.nix
           ./common/nix.nix
-          ./devices/common-gpt.nix
+          ./devices/common.nix
-        ];
-        common-mbr = [
-          ./common/personal.nix
-          ./common/nix.nix
-          ./devices/common-mbr.nix
         ];
         dev = [
           ./common/dev/podman.nix
@@ -102,7 +97,6 @@
           ++ modules.nixos.desktops.common
           ++ modules.nixos.desktops.gnome
           ++ [
-            ./common/desktop/drivers/skynet.nix
             ./devices/skynet/base.nix
             nixos-hardware.nixosModules.framework-12th-gen-intel
             agenix.nixosModules.default
@@ -124,12 +118,13 @@
         pkgs = pkgsForSystem "x86_64-linux";
         system = "x86_64-linux";
         modules =
-          modules.nixos.common-mbr
+          modules.nixos.services.common
-          ++ modules.nixos.services.common
           ++ [
             agenix.nixosModules.default
             ./devices/crystal-gitlab/base.nix
             ./services/crystal/gitlab-runner.nix
+            ./common/personal.nix
+            ./common/nix.nix
           ];
       };
     };