transcaffeine/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(affogato): use upstream nixos-hardware model, enable power-profiles-daemon, add repo-local pkgs overlay

Browse Source
This commit is contained in:
transcaffeine 2025-03-04 19:23:28 +01:00
parent fef153c9d8
commit b874613227
Signed by: transcaffeine
GPG Key ID: 03624C433676E465
6 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flake.lock generated
View File

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1732466619, "lastModified": 1739757849,
"narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f3111f62a23451114433888902a55cf0692b408d", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -19,6 +19,21 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731755305, "lastModified": 1731755305,
@ -37,11 +52,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1732350895, "lastModified": 1740932899,
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,6 +69,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
} }
} }

1
flake.nix
View File

@ -2,6 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-24.11";
nixos-hardware.url = "github:NixOS/nixos-hardware";
}; };
outputs = inputs @ { self, nixpkgs, ... }: { outputs = inputs @ { self, nixpkgs, ... }: {

10
hosts/affogato/default.nix
View File

@ -1,5 +1,6 @@
{ pkgs, ... }: { { inputs, pkgs, ... }: {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.chuwi-minibook-x
./hardware-configuration.nix ./hardware-configuration.nix
./n100.nix ./n100.nix
../../profiles/base ../../profiles/base
@ -14,12 +15,10 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_6_13;
#boot.kernelPackages = pkgs.linuxPackages_6_6;
boot.kernelParams = [ boot.kernelParams = [
"fbcon=rotate:1"
# disable panel self refresh for i915 # disable panel self refresh for i915
"i915.enable_psr=0" #"i915.enable_psr=0"
# set max cstate to 2 (suspend?) # set max cstate to 2 (suspend?)
# "intel_idle.max_cstate=2" # "intel_idle.max_cstate=2"
"nvme.noacpi=1" "nvme.noacpi=1"
@ -52,6 +51,7 @@
services.avahi.enable = true; services.avahi.enable = true;
services.tailscale.enable = true; services.tailscale.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
services.power-profiles-daemon.enable = true;
# TODO: delete this later # TODO: delete this later
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?

1
hosts/affogato/hardware-configuration.nix
View File

@ -36,7 +36,6 @@
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s20f0u1u3.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.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;

5
pkgs/default.nix Normal file
View File

@ -0,0 +1,5 @@
final: prev: {
cpupower = prev.cpupower.overrideAttrs (oldAttrs: {
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.which ];
});
}

3
profiles/base/default.nix
View File

@ -1,4 +1,7 @@
{ inputs, pkgs, ...}: { { inputs, pkgs, ...}: {
nixpkgs.overlays = [
(import ../../pkgs)
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.trusted-users = [ "root" "@wheel" ]; nix.settings.trusted-users = [ "root" "@wheel" ];
nix.registry.nixpkgs.flake = inputs.nixpkgs; nix.registry.nixpkgs.flake = inputs.nixpkgs;