diff --git a/cranberry/default.nix b/cranberry/default.nix
new file mode 100644
index 0000000..f8b43df
--- /dev/null
+++ b/cranberry/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    disko.devices.disk."${config.networking.hostName}".device = "/dev/disk/by-id/nvme-UMIS_RPJTJ128MEE1MWX_SS0L25188X3RC12121TP";
+    networking.hostName = "cranberry";
+  };
+  imports = [
+    ../common/disko/single_uefi_btrfs.nix
+    ./hardware.nix
+    ./features.nix
+  ];
+}
diff --git a/cranberry/features.nix b/cranberry/features.nix
new file mode 100644
index 0000000..36e930a
--- /dev/null
+++ b/cranberry/features.nix
@@ -0,0 +1,9 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    frogeye = {
+      desktop.xorg = true;
+      extra = true;
+    };
+  };
+}
diff --git a/cranberry/hardware.nix b/cranberry/hardware.nix
new file mode 100644
index 0000000..7a6950c
--- /dev/null
+++ b/cranberry/hardware.nix
@@ -0,0 +1,28 @@
+{ pkgs, lib, config, nixos-hardware, ... }:
+{
+  config = {
+    boot = {
+      # nixos-hardware use latest kernel by default. It has been set a while ago, we maybe don't need it anymore?
+      kernelPackages = pkgs.linuxPackages;
+
+      # Otherwise it will not show stage1 echo and prompt
+      # UPST
+      kernelParams = [ "console=tty0" ];
+
+      # EFI Variables don't seem to work (no generation appear in systemd-boot with SD)
+      loader.efi.canTouchEfiVariables = false;
+    };
+
+    frogeye.desktop = {
+      x11_screens = [ "eDP-1" ];
+      maxVideoHeight = 1080;
+    };
+
+  };
+  imports = [
+    nixos-hardware.nixosModules.common-cpu-amd
+    nixos-hardware.nixosModules.common-gpu-amd
+    nixos-hardware.nixosModules.common-pc-laptop
+    nixos-hardware.nixosModules.common-pc-ssd
+  ];
+}
diff --git a/flake.nix b/flake.nix
index f337869..112b99b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,6 +135,10 @@
         system = "aarch64-linux";
         modules = [ ./pindakaas/sd.nix ];
       };
+      nixosConfigurations.cranberry = lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [ ./cranberry ];
+      };
       nixOnDroidConfigurations.sprinkles = lib.nixOnDroidConfiguration { };
     } // (lib.flakeTools { inherit self; });
 }