diff --git a/README.md b/README.md
index b2c12b3..1e1ba98 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,7 @@ See code for all available configurations.
 | [GPD WIN Max 2 2023](gpd/win-max-2/2023)                               | `<nixos-hardware/gpd/win-max-2/2023>`                   |
 | [Google Pixelbook](google/pixelbook)                                   | `<nixos-hardware/google/pixelbook>`                     |
 | [HP Elitebook 2560p](hp/elitebook/2560p)                               | `<nixos-hardware/hp/elitebook/2560p>`                   |
+| [HP Elitebook 830g6](hp/elitebook/830/g6)                              | `<nixos-hardware/hp/elitebook/830/g6>`                  |
 | [HP Elitebook 845g7](hp/elitebook/845/g7)                              | `<nixos-hardware/hp/elitebook/845/g7>`                  |
 | [HP Elitebook 845g8](hp/elitebook/845/g8)                              | `<nixos-hardware/hp/elitebook/845/g8>`                  |
 | [HP Elitebook 845g9](hp/elitebook/845/g9)                              | `<nixos-hardware/hp/elitebook/845/g9>`                  |
diff --git a/flake.nix b/flake.nix
index f1404d0..123f9f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,6 +90,7 @@
       gpd-win-2 = import ./gpd/win-2;
       gpd-win-max-2-2023 = import ./gpd/win-max-2/2023;
       hp-elitebook-2560p = import ./hp/elitebook/2560p;
+      hp-elitebook-830g6 = import ./hp/elitebook/830/g6;
       hp-elitebook-845g7 = import ./hp/elitebook/845/g7;
       hp-elitebook-845g8 = import ./hp/elitebook/845/g8;
       hp-elitebook-845g9 = import ./hp/elitebook/845/g9;
diff --git a/hp/elitebook/830/g6/README.md b/hp/elitebook/830/g6/README.md
new file mode 100644
index 0000000..eb9e4e8
--- /dev/null
+++ b/hp/elitebook/830/g6/README.md
@@ -0,0 +1,8 @@
+# HP Elitebook 830 G6
+
+## solved problems
+* KDE Plasma 5 (haven't tested others), ~20% of the time freezes at login screen on resume - setting hardare.enableAllFirmware seems to fix
+
+## Unsolved Problems
+
+* sometimes fails to sleep (seems to be an application causing it, so probably not a driver/kernel problem)
diff --git a/hp/elitebook/830/g6/default.nix b/hp/elitebook/830/g6/default.nix
new file mode 100644
index 0000000..b61b263
--- /dev/null
+++ b/hp/elitebook/830/g6/default.nix
@@ -0,0 +1,26 @@
+{ pkgs, lib, ... }:
+{
+  imports = [
+    ../../../../common/cpu/intel
+    ../../../../common/pc/laptop
+    ../../../../common/pc/laptop/acpi_call.nix
+    ../../../../common/pc/laptop/ssd
+  ];
+
+  # Needed for wifi
+  hardware.enableRedistributableFirmware = lib.mkDefault true;
+
+  # Cooling management
+  services.thermald.enable = lib.mkDefault true;
+
+  # Allows for updating firmware via `fwupdmgr`.
+  services.fwupd.enable = lib.mkDefault true;
+
+  # Enables ACPI platform profiles
+  boot = lib.mkIf (lib.versionAtLeast pkgs.linux.version "6.1") {
+    kernelModules = [ "hp-wmi" ];
+  };
+
+  # reduces warnings/errors in boot log, seems to eliminate the ocassional boot hangs described in readme
+  hardware.enableAllFirmware = lib.mkDefault true;
+}