diff --git a/flake.lock b/flake.lock
index c17f14b..ce7b9f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -162,6 +162,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1757103352,
+        "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "11b2a10c7be726321bb854403fdeec391e798bf0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1741379970,
@@ -199,6 +215,7 @@
         "agenix": "agenix",
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager_2",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2"
       }
     },
diff --git a/flake.nix b/flake.nix
index 01a0d20..e56d8dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,17 +12,22 @@
     flake-utils.url = "github:numtide/flake-utils";
 
     agenix.url = "github:yaxitech/ragenix";
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = { self, nixpkgs, home-manager, flake-utils, agenix, ... }@inputs:
-    let inherit (self) outputs;
+  outputs = { self, nixpkgs, home-manager, flake-utils, agenix, nixos-hardware
+    , ... }@inputs:
+    let
+      coreModules =
+        [ home-manager.nixosModules.default agenix.nixosModules.default ];
+      inherit (self) outputs;
     in {
       nixosConfigurations.minji = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inputs = inputs; };
-        modules = [
-          home-manager.nixosModules.default
-          agenix.nixosModules.default
+        modules = coreModules ++ [
+          nixos-hardware.nixosModules.framework-16-7040-amd
           ./nix/hosts/common/sys.nix
           ./nix/hosts/minji/sys.nix
         ];
@@ -31,7 +36,7 @@
       nixosConfigurations.chaewon = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inputs = inputs; };
-        modules = [
+        modules = coreModules ++ [
           home-manager.nixosModules.default
           agenix.nixosModules.default
           ./nix/hosts/common/sys.nix
diff --git a/nix/hosts/minji/sys.nix b/nix/hosts/minji/sys.nix
index 19d7e69..ddde405 100644
--- a/nix/hosts/minji/sys.nix
+++ b/nix/hosts/minji/sys.nix
@@ -151,12 +151,11 @@
     };
   };
 
-  # Window Manager
-  programs.niri.enable = true;
-  programs.xwayland.enable = true;
-
   services.swaynotificationcenter.enable = true;
 
+  ## Battery
+  services.power-profiles-daemon.enable = true;
+
   services.tailscale = {
     enable = true;
     useRoutingFeatures = "client";
@@ -173,6 +172,10 @@
   };
 
   # Programs
+  ## Window Manager
+  programs.niri.enable = true;
+  programs.xwayland.enable = true;
+
   programs.kdeconnect = {
     enable = true;
     package = pkgs.kdePackages.kdeconnect-kde;