diff --git a/configuration.nix b/configuration.nix
index 8edb6b7..da965b2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,7 +11,7 @@
 
   # Use the systemd-boot EFI boot loader.
   # changed to grub following the (ZFS tutorial)[https://nixos.wiki/wiki/ZFS]
-  boot.loader.grub = {
+  boot.loader.grub = lib.mkDefault {
     enable = true;
     zfsSupport = true;
     efiSupport = true;
@@ -132,5 +132,6 @@
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "24.11"; # Did you read the comment?
 
+  nix.settings.trusted-users = [ "shatteredmint" ];
 }
 
diff --git a/flake.lock b/flake.lock
index 243d935..3c7ded3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "friendlyelecCM3588": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771227633,
+        "narHash": "sha256-uUZMqpQ+Hv4CzwWSZeLpdPEth0W2+d0MlnZb073XjwY=",
+        "owner": "YayaADev",
+        "repo": "nixos-friendlyelec-cm3588",
+        "rev": "687a43f7a8961d7929e82494cfeb55c031638192",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YayaADev",
+        "repo": "nixos-friendlyelec-cm3588",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -38,6 +58,7 @@
     },
     "root": {
       "inputs": {
+        "friendlyelecCM3588": "friendlyelecCM3588",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index b3d52eb..121b3a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,10 @@
       # follow defined nixpkgs to prevent version mismatch
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    friendlyelecCM3588 = {
+      url = "github:YayaADev/nixos-friendlyelec-cm3588";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {self, nixpkgs, home-manager, ... }@inputs: 
@@ -54,8 +58,8 @@
         specialArgs = inputs;
 
         modules = [
-          ./devices/nas.nix
-          
+          inputs.friendlyelecCM3588.nixosModules.cm3588  # board + kernel support
+
           ./configuration.nix
 
           ./users/shatteredmint.nix