Merge pull request #47 from Thymis-io/feat/raspberry-pi-3

Support for Raspberry Pi 3
Thymis-io · Jul 12, 2024 · 12fd666 · 12fd666
2 parents 89407cf + dd4b007
commit 12fd666
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 24 deletions.
diff --git a/controller/thymis_controller/modules/screenshotmodules.py b/controller/thymis_controller/modules/screenshotmodules.py
@@ -17,7 +17,6 @@ class ScreenshotModuleNotAvaliable(modules.Module):
     def write_nix_settings(
         self, f, module_settings: models.ModuleSettings, priority: int
     ):
-        f.write(f'  hardware.raspberry-pi."4".fkms-3d.enable = true;\n')
         f.write(
             f"""
 services.xserver.displayManager.sddm.enable = true;

diff --git a/controller/thymis_controller/modules/thymis.py b/controller/thymis_controller/modules/thymis.py
@@ -25,7 +25,7 @@ class ThymisDevice(modules.Module):
     device_type = models.Setting(
         name="thymis.config.device-type",
         type="select-one",
-        options=["generic-x86_64", "raspberry-pi-4", "generic-aarch64"],
+        options=["generic-x86_64", "raspberry-pi-3", "raspberry-pi-4", "generic-aarch64"],
         default="",
         description="The device type of the thymis device.",
         example="",

diff --git a/devices.nix b/devices.nix
@@ -24,12 +24,34 @@ let
         };
         nixpkgs.hostPlatform = "aarch64-linux";
       };
+      raspberry-pi-3 = {
+        imports = [
+          inputs.nixos-generators.nixosModules.all-formats
+          #inputs.nixos-hardware.nixosModules.raspberry-pi-3
+          inputs.nixos-generators.nixosModules.sd-aarch64
+        ];
+        formatConfigs = lib.mkForce {
+          sd-card-image = {
+            imports = [
+              inputs.nixos-generators.nixosModules.sd-aarch64
+            ];
+            sdImage.compressImage = false;
+            fileExtension = ".img";
+          };
+        };
+        nixpkgs.overlays = [
+          (final: super: {
+            makeModulesClosure = x:
+              super.makeModulesClosure (x // { allowMissing = true; });
+          })
+        ];
+        nixpkgs.hostPlatform = "aarch64-linux";
+      };
       raspberry-pi-4 = {
         imports = [
           inputs.nixos-generators.nixosModules.all-formats
           inputs.nixos-hardware.nixosModules.raspberry-pi-4
           inputs.nixos-generators.nixosModules.sd-aarch64
-
         ];
         hardware.raspberry-pi."4".fkms-3d.enable = true;
         formatConfigs = lib.mkForce {

diff --git a/flake.lock b/flake.lock
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
@@ -153,6 +153,7 @@
 					"device-type": "Device Type",
 					"device-type-options": {
 						"generic-x86_64": "Generic x86 Device (e.g. PC)",
+						"raspberry-pi-3": "Raspberry Pi 3",
 						"raspberry-pi-4": "Raspberry Pi 4",
 						"generic-aarch64": "Generic ARM64 Device"
 					},