From 3df12aafe3028f700350093f378fe8e3a51452dc Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Thu, 16 Oct 2025 15:09:44 +0200 Subject: [PATCH] dustbowl: add nixos-hardware --- flake.lock | 17 +++++++++++++++++ flake.nix | 10 ++++++++-- nixos/dustbowl.nix | 2 ++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 47a20b2..3673312 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1759036355, @@ -54,6 +70,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-bitwig": "nixpkgs-bitwig" } diff --git a/flake.nix b/flake.nix index 82068ee..7e01379 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,9 @@ flake = false; }; inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - outputs = { self, nixpkgs, nixpkgs-bitwig, flake-utils }: + outputs = { self, nixpkgs, nixpkgs-bitwig, flake-utils, nixos-hardware }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { @@ -81,7 +82,12 @@ privilegeEscalationCommand = [ "doas" ]; }; - imports = [ (import ./nixos/dustbowl.nix { nixpkgs = nixpkgs; }) ]; + imports = [ + (import ./nixos/dustbowl.nix { nixpkgs = nixpkgs; }) + nixos-hardware.nixosModules.asus-battery + nixos-hardware.nixosModules.common-pc-laptop + nixos-hardware.nixosModules.common-cpu-intel + ]; }; }; diff --git a/nixos/dustbowl.nix b/nixos/dustbowl.nix index 47dabc8..7e1239a 100644 --- a/nixos/dustbowl.nix +++ b/nixos/dustbowl.nix @@ -140,6 +140,8 @@ openrgb ]; + hardware.asus.battery.chargeUpto = 80; + # Configure console console = { font = "Lat2-Terminus16";