diff --git a/flake.lock b/flake.lock index c6d52cb..52a6439 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732466619, - "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3111f62a23451114433888902a55cf0692b408d", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -19,6 +19,21 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1731755305, @@ -37,11 +52,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732350895, - "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", + "lastModified": 1740932899, + "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", + "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "type": "github" }, "original": { @@ -54,6 +69,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2" } } diff --git a/flake.nix b/flake.nix index f29f392..92aa467 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; home-manager.url = "github:nix-community/home-manager/release-24.11"; + nixos-hardware.url = "github:NixOS/nixos-hardware"; }; outputs = inputs @ { self, nixpkgs, ... }: { diff --git a/hosts/affogato/default.nix b/hosts/affogato/default.nix index 624e97c..191aeb0 100644 --- a/hosts/affogato/default.nix +++ b/hosts/affogato/default.nix @@ -1,5 +1,6 @@ -{ pkgs, ... }: { +{ inputs, pkgs, ... }: { imports = [ + inputs.nixos-hardware.nixosModules.chuwi-minibook-x ./hardware-configuration.nix ./n100.nix ../../profiles/base @@ -14,12 +15,10 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_latest; - #boot.kernelPackages = pkgs.linuxPackages_6_6; + boot.kernelPackages = pkgs.linuxPackages_6_13; boot.kernelParams = [ - "fbcon=rotate:1" # disable panel self refresh for i915 - "i915.enable_psr=0" + #"i915.enable_psr=0" # set max cstate to 2 (suspend?) # "intel_idle.max_cstate=2" "nvme.noacpi=1" @@ -52,6 +51,7 @@ services.avahi.enable = true; services.tailscale.enable = true; services.blueman.enable = true; + services.power-profiles-daemon.enable = true; # TODO: delete this later system.stateVersion = "23.05"; # Did you read the comment? diff --git a/hosts/affogato/hardware-configuration.nix b/hosts/affogato/hardware-configuration.nix index 71663c1..acdeb10 100644 --- a/hosts/affogato/hardware-configuration.nix +++ b/hosts/affogato/hardware-configuration.nix @@ -36,7 +36,6 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s20f0u1u3.useDHCP = lib.mkDefault true; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.bluetooth.enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..01e47e7 --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,5 @@ +final: prev: { + cpupower = prev.cpupower.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.which ]; + }); +} diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 14e122e..3707854 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -1,4 +1,7 @@ { inputs, pkgs, ...}: { + nixpkgs.overlays = [ + (import ../../pkgs) + ]; nixpkgs.config.allowUnfree = true; nix.settings.trusted-users = [ "root" "@wheel" ]; nix.registry.nixpkgs.flake = inputs.nixpkgs;