diff --git a/flake.nix b/flake.nix
index aed801c..f98043f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,10 @@
          url = "github:nix-community/home-manager/release-23.11";
          inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list where available
       };
+      nixos-hardware.url = "github:NixOS/nixos-hardware/master";
    };
 
-   outputs = { self, nixpkgs, disko, home-manager, ... }@inputs: {
+   outputs = { self, nixpkgs, disko, home-manager, nixos-hardware, ... }@inputs: {
       nixosConfigurations = {
          "nixos" = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
@@ -89,7 +90,7 @@
                disko.nixosModules.disko
                ./disko-config.nix
                ./gnome.nix
-               ./garrus.nix
+               ./jaal.nix
                ./configuration.nix
                ./hardware-configuration.nix
                home-manager.nixosModules.home-manager
@@ -98,6 +99,7 @@
                   home-manager.useUserPackages = true;
                   home-manager.users.aaronh = import ./home.nix;
                }
+               nixos-hardware.nixosModules.pine64-pinebook-pro
             ];
          };
 
diff --git a/home.nix b/home.nix
index 081d0ee..34182c5 100644
--- a/home.nix
+++ b/home.nix
@@ -22,11 +22,9 @@
 
   home.packages = with pkgs; [
     # GUI
-    discord
     libreoffice-fresh
     signal-desktop
     system76-keyboard-configurator
-    tuba
     #youtube-music
 
     # CLI
diff --git a/hosts/aarch64/jaal/configuration.nix b/hosts/aarch64/jaal/configuration.nix
new file mode 100644
index 0000000..2e7640e
--- /dev/null
+++ b/hosts/aarch64/jaal/configuration.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports =
+    [
+        ./hardware-configuration.nix
+    ];
+
+  boot.kernelParams = [ "console=tty0" ];
+
+  networking.hostName = "jaal";
+
+}
diff --git a/hosts/aarch64/jaal/pbp.nix b/hosts/aarch64/jaal/pbp.nix
deleted file mode 100644
index d4f4b62..0000000
--- a/hosts/aarch64/jaal/pbp.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }: 
-
-{
-    # Name your host machine
-    networking.hostName = "jaal"; 
-    
-}
diff --git a/hosts/aarch64/jaal/pinebook-pro.nix b/hosts/aarch64/jaal/pinebook-pro.nix
deleted file mode 100644
index a078a47..0000000
--- a/hosts/aarch64/jaal/pinebook-pro.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports =
-    [
-#        <nixos-hardware/pine64/pinebook-pro>
-        ./hardware-configuration.nix
-#       ./programs.nix
-    ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = [ "console=tty0" ];
-
-  boot.loader = {
-    efi = {
-    canTouchEfiVariables = false;
-  };
-
-  grub = {
-    enable = true;
-    efiInstallAsRemovable = true;
-    efiSupport = true;
-    version = 2;
-    device = "nodev";
-    };
-  };
-
-  boot.initrd.luks.devices = {
-    root = { 
-    device = "/dev/sda";
-    preLVM = true;
-    };
-  };
-
-  boot.initrd.kernelModules = [
-    # Rockchip modules
-    "rockchip_rga"
-    "rockchip_saradc"
-    "rockchip_thermal"
-    "rockchipdrm"
-
-    # GPU/Display modules
-    "analogix_dp"
-    "cec"
-    "drm"
-    "drm_kms_helper"
-    "dw_hdmi"
-    "dw_mipi_dsi"
-    "gpu_sched"
-    "panel_edp"
-    "panel_simple"
-    "panfrost"
-    "pwm_bl"
-
-    # USB / Type-C related modules
-    "fusb302"
-    "tcpm"
-    "typec"
-
-    # Misc. modules
-    "cw2015_battery"
-    "gpio_charger"
-    "rtc_rk808"
-  ];
-
-  nix.settings.auto-optimise-store = true;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  nix.gc = {
-     automatic = true;
-     dates = "weekly";
-     options = "--delete-older-than 30d";
-   };
-
-  networking = {
-    hostName = "jaal";
-    networkmanager.enable = true;
-  };
-
-  # Set your time zone.
-  time.timeZone = "America/Denver";
-
-  environment.systemPackages = 
-            with pkgs; 
-            [
-              firefox
-              git
-              git-lfs
-              neofetch
-              unzip
-              wget
-            ]; 
-
-  # Define user accounts
-    users.users.aaronh = {
-            description = "Aaron Honeycutt";
-            home = "/home/aaronh";
-            extraGroups = [ "wheel" "networkmanager" "adm"];
-            isNormalUser = true;
-            hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx.";
-
-    packages = with pkgs; [
-      fish
-    ];
-
-    shell = pkgs.fish;
-    };
-
-  # Enable Pipewire
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
- 
-  # Turn off PulseAudio
-  hardware.pulseaudio.enable = false;
-
-  # Enable Bluetooth
-  hardware.bluetooth.enable = true;
-
-  # Enable the OpenSSH daemon
-  services.openssh.enable = true;
-
-  # Enable CUPS
-  services.printing.enable = true;
-
-  # Allow Unfree
-  nixpkgs.config.allowUnfree = true;
-
-  # System 
-  system.stateVersion = "23.11";
-  system.autoUpgrade.enable = true;
-
-}