alpha-2

Sky360-Repository · Sep 13, 2023 · c2b9986 · c2b9986
1 parent 0a3cb51
commit c2b9986
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 16 deletions.
diff --git a/nixOS/Systems/Base/default.nix b/nixOS/Systems/Base/default.nix
@@ -16,7 +16,8 @@
 
   services.openssh = {
     enable = true;
-    passwordAuthentication = false; # disable ssh with password
+    settings.PasswordAuthentication = false;
+    # settings.passwordAuthentication = false; # disable ssh with password
   };
 
   system.stateVersion = "23.11";

diff --git a/nixOS/flake.lock b/nixOS/flake.lock
diff --git a/nixOS/flake.nix b/nixOS/flake.nix
@@ -24,37 +24,76 @@
     # mesa-panfork,
     ...
   }: let
+    version = "0.2.0";
     # nixpkgs.config.allowUnfree = true;
   in {
     nixosConfigurations = {
       cyclop-orange_pi_5_plus = import "${nixpkgs}/nixos/lib/eval-config.nix" rec {
         system = "aarch64-linux";
         specialArgs = inputs;
         modules = [
-          # import the rk3588 module, which contains the configuration for bootloader/ernel/firmware
           (nixos-rk3588 + "/modules/boards/orangepi5plus.nix")
           Systems/Base
           Systems/cyclop.nix
           {
             networking.hostName = "cyclop-orange_pi_5_plus";
           }
-          # {
-          # sdImage = {
-          # imageName = "sky360-cyclop-orange_pi_5_plus.img";
-          # compressImage = false;
-          # };
-          # }
+          {
+            sdImage = {
+              imageName = "sky360-cyclop-orangepi5plus-${version}";
+            };
+          }
+        ];
+      };
+
+      cyclop-orange_pi_5 = import "${nixpkgs}/nixos/lib/eval-config.nix" rec {
+        system = "aarch64-linux";
+        specialArgs = inputs;
+        modules = [
+          (nixos-rk3588 + "/modules/boards/orangepi5.nix")
+          Systems/Base
+          Systems/cyclop.nix
+          {
+            networking.hostName = "cyclop-orange_pi_5";
+          }
+          {
+            sdImage = {
+              imageName = "sky360-cyclop-orangepi5-${version}";
+            };
+          }
+        ];
+      };
+
+      cyclop-rock5a = import "${nixpkgs}/nixos/lib/eval-config.nix" rec {
+        system = "aarch64-linux";
+        specialArgs = inputs;
+        modules = [
+          (nixos-rk3588 + "/modules/boards/rock5a.nix")
+          Systems/Base
+          Systems/cyclop.nix
+          {
+            networking.hostName = "cyclop-rock5a";
+          }
+          {
+            sdImage = {
+              imageName = "sky360-cyclop-rock5-${version}";
+            };
+          }
         ];
       };
     };
 
     packages = {
       aarch64 = {
         cyclop-orange_pi_5_plus-sd_image = self.nixosConfigurations.cyclop-orange_pi_5_plus.config.system.build.sdImage;
+
+        cyclop-orange_pi_5-sd_image = self.nixosConfigurations.cyclop-orange_pi_5.config.system.build.sdImage;
+
+        cyclop-rock5a-sd_image = self.nixosConfigurations.cyclop-rock5a.config.system.build.sdImage;
         ######
         # };
         # Raspberry pi 4 - All Sky Camera
-        cyclop-rpi4 = nixos-generators.nixosGenerate {
+        cyclop-rpi4-sd_image = nixos-generators.nixosGenerate {
           system = "aarch64-linux";
           format = "sd-aarch64-installer"; # rpi-4
           modules = [
@@ -63,7 +102,7 @@
             Systems/cyclop.nix
             {
               sdImage = {
-                imageName = "sky360-cyclop-orange_pi_5_plus.img";
+                imageName = "sky360-cyclop-rpi4-${version}.img";
                 #compressImage = false;
               };
             }