From bcb36fb11b8f0887b1ad65444abb1a7ff2c712d5 Mon Sep 17 00:00:00 2001 From: Adrian Block Date: Wed, 3 Jul 2024 08:55:36 +0200 Subject: [PATCH 1/3] added raspberry-pi 3 to devices --- .../thymis_controller/modules/thymis.py | 2 +- devices.nix | 24 +++++++++++ flake.lock | 42 +++++++++---------- frontend/src/locales/en.json | 1 + 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/controller/thymis_controller/modules/thymis.py b/controller/thymis_controller/modules/thymis.py index 21fa4cac..d7861441 100644 --- 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 index a609fca7..4e329a36 100644 --- a/devices.nix +++ b/devices.nix @@ -24,6 +24,30 @@ 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 diff --git a/flake.lock b/flake.lock index 6331f6c9..ad6c14b5 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1712386041, - "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "lastModified": 1719827415, + "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixlib": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1713783234, - "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", + "lastModified": 1719841141, + "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", + "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", "type": "github" }, "original": { @@ -98,11 +98,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713521961, - "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713725259, - "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -139,11 +139,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1708589824, - "narHash": "sha256-2GOiFTkvs5MtVF65sC78KNVxQSmsxtk0WmV1wJ9V2ck=", + "lastModified": 1719850884, + "narHash": "sha256-UU/lVTHFx0GpEkihoLJrMuM9DcuhZmNe3db45vshSyI=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "3c92540611f42d3fb2d0d084a6c694cd6544b609", + "rev": "42262f382c68afab1113ebd1911d0c93822d756e", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1708335038, - "narHash": "sha256-ETLZNFBVCabo7lJrpjD6cAbnE11eDOjaQnznmg/6hAE=", + "lastModified": 1719749022, + "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e504621290a1fd896631ddbc5e9c16f4366c9f65", + "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", "type": "github" }, "original": { diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 0a5eea13..69f1bce9 100644 --- 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" }, From 3c4b510892578150207bbc53f04383c1a17e13e6 Mon Sep 17 00:00:00 2001 From: Adrian Block Date: Wed, 3 Jul 2024 09:14:35 +0200 Subject: [PATCH 2/3] removed option in Screenshot Module that only refers to rpi4 --- controller/thymis_controller/modules/screenshotmodules.py | 1 - flake.lock | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/controller/thymis_controller/modules/screenshotmodules.py b/controller/thymis_controller/modules/screenshotmodules.py index 1a8ac23e..d6234208 100644 --- 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/flake.lock b/flake.lock index ad6c14b5..84945a63 100644 --- a/flake.lock +++ b/flake.lock @@ -113,11 +113,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1719837636, + "narHash": "sha256-sTya/Vhqtdi7Kxx/eVldJRGTPKcyGgFG3ZugOqcbmiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "28f8f3531ebdbea069995c20bd946a295699f275", "type": "github" }, "original": { From dd4b0072a17f0029a38b0c3ac846c571485a536f Mon Sep 17 00:00:00 2001 From: Adrian Block Date: Thu, 4 Jul 2024 09:45:33 +0200 Subject: [PATCH 3/3] working rpi3 after change to generic aarch64 --- devices.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devices.nix b/devices.nix index 4e329a36..1dd50c93 100644 --- a/devices.nix +++ b/devices.nix @@ -27,9 +27,8 @@ let raspberry-pi-3 = { imports = [ inputs.nixos-generators.nixosModules.all-formats - inputs.nixos-hardware.nixosModules.raspberry-pi-3 + #inputs.nixos-hardware.nixosModules.raspberry-pi-3 inputs.nixos-generators.nixosModules.sd-aarch64 - ]; formatConfigs = lib.mkForce { sd-card-image = { @@ -53,7 +52,6 @@ let 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 {