From d6f6154a22cd7d339733f159069025de1b6fbd6d Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Fri, 22 Dec 2023 01:49:28 +0800
Subject: [PATCH] fix: suzu - orangepi5

---
 hosts/12kingdoms/suzu/default.nix  |  5 ++---
 modules/base.nix                   |  3 ---
 modules/nixos/desktop/security.nix |  5 +++++
 systems/colmena.nix                | 12 ++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hosts/12kingdoms/suzu/default.nix b/hosts/12kingdoms/suzu/default.nix
index 14e56db1..62719e56 100644
--- a/hosts/12kingdoms/suzu/default.nix
+++ b/hosts/12kingdoms/suzu/default.nix
@@ -3,7 +3,7 @@
   username,
   nixos-rk3588,
   ...
-} @ args:
+}:
 #############################################################
 #
 #  Aquamarine - A NixOS VM running on Proxmox
@@ -11,9 +11,8 @@
 #############################################################
 {
   imports = [
-
     # import the rk3588 module, which contains the configuration for bootloader/kernel/firmware
-    (nixos-rk3588 + "/modules/boards/orangepi5.nix")
+    nixos-rk3588.nixosModules.orangepi5
   ];
 
   users.users.root.openssh.authorizedKeys.keys = config.users.users."${username}".openssh.authorizedKeys.keys;
diff --git a/modules/base.nix b/modules/base.nix
index 31777060..2f7c4215 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -4,9 +4,6 @@
   username,
   ...
 }: {
-  nix.extraOptions = ''
-    !include ${config.age.secrets.nix-access-tokens.path}
-  '';
   nix.settings = {
     # enable flakes globally
     experimental-features = ["nix-command" "flakes"];
diff --git a/modules/nixos/desktop/security.nix b/modules/nixos/desktop/security.nix
index 53e39104..1b206197 100644
--- a/modules/nixos/desktop/security.nix
+++ b/modules/nixos/desktop/security.nix
@@ -1,4 +1,9 @@
+{ config, ...}:
 {
+  nix.extraOptions = ''
+    !include ${config.age.secrets.nix-access-tokens.path}
+  '';
+
   # security with polkit
   services.power-profiles-daemon = {
     enable = true;
diff --git a/systems/colmena.nix b/systems/colmena.nix
index 52b4e6c0..e2ef2f84 100644
--- a/systems/colmena.nix
+++ b/systems/colmena.nix
@@ -29,11 +29,12 @@ with allSystemAttrs; let
   # aarch64 related
   # using the same nixpkgs as nixos-rk3588 to utilize the cross-compilation cache.
   rk3588_pkgs = import nixos-rk3588.inputs.nixpkgs {system = x64_system;};
-  rk3588_specialArgs =
-    {
-      inherit username userfullname useremail;
-    }
-    // nixos-rk3588.inputs;
+  rk3588_specialArgs = {
+    inherit username userfullname useremail;
+    inherit (nixos-rk3588.inputs) nixpkgs;
+    # Provide rk3588 inputs as special argument
+    rk3588 = nixos-rk3588.inputs;
+  };
   rk3588_base_args = {
     inherit home-manager;
     inherit (nixos-rk3588.inputs) nixpkgs; # or nixpkgs-unstable
@@ -47,7 +48,6 @@ in {
       nixpkgs = import nixpkgs {system = x64_system;};
       specialArgs = allSystemSpecialArgs.x64_system;
 
-
       nodeSpecialArgs = {
         # riscv64 SBCs
         nozomi = lpi4a_specialArgs;