diff --git a/flake.nix b/flake.nix
index 94bd9f71..ef487d71 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,12 +21,21 @@
     libx = import ./lib { inherit inputs outputs stateVersion hmStateVersion; };
   in {
     nixosConfigurations = {
+      # Currently a Lenovo P1 Gen 5
       nixos-laptop  = libx.mkHost { 
         hostname = "nixos-laptop";  username = "albert"; desktop = "hyprland"; gpu = "intel";  theme = "gruvbox"; 
       };
+      # Ryzen 7 Framework 13
+      nixos-framework = libx.mkHost {
+        hostname = "nixos-framework"; username = "albert"; desktop = "hyprland"; gpu = "amd"; theme = "gruvbox";
+      };
       nixos-desktop = libx.mkHost { 
         hostname = "nixos-desktop"; username = "albert"; desktop = "gnome";    gpu = "nvidia"; theme = "gruvbox"; 
       };
+      # Testing ARM NixOS
+      nixos-rpi-01 = libx.mkHost =  {
+        hostname = "nixos-rpi-01";   username = "albert"; platform = "";
+      };
     };
     homeConfigurations = {
       "albert@nixos-laptop"  = libx.mkHome { 
diff --git a/nixos/hosts/nixos-rpi-01/default.nix b/nixos/hosts/nixos-rpi-01/default.nix
new file mode 100644
index 00000000..9904dccc
--- /dev/null
+++ b/nixos/hosts/nixos-rpi-01/default.nix
@@ -0,0 +1,33 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+      fsType = "ext4";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+}
\ No newline at end of file