jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

framework 16 try 1

Browse source
This commit is contained in:
Julian Sutter 2024-05-24 05:02:46 +00:00
parent aca917b884
commit fea287accf
2 changed files with 3 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -7,14 +7,16 @@
url = github:nix-community/home-manager; url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };
outputs = { self, nixpkgs, home-manager }: { outputs = { self, nixpkgs, home-manager, nixos-hardware }: {
nixosConfigurations = { nixosConfigurations = {
framework = nixpkgs.lib.nixosSystem { framework = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
nixos-hardware.nixosModules.
./systems/common.nix ./systems/common.nix
./systems/framework.nix ./systems/framework.nix
./users/jsutter.nix ./users/jsutter.nix

27
systems/framework.nix
View file

@ -20,30 +20,6 @@
hardware.cpu.intel.updateMicrocode = lib.mkDefault hardware.cpu.intel.updateMicrocode = lib.mkDefault
config.hardware.enableRedistributableFirmware; config.hardware.enableRedistributableFirmware;
# From Flakes
boot.kernelParams = [
# For Power consumption
# https://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html
"mem_sleep_default=deep"
# For Power consumption
# https://community.frame.work/t/linux-battery-life-tuning/6665/156
"nvme.noacpi=1"
# Workaround iGPU hangs
# https://discourse.nixos.org/t/intel-12th-gen-igpu-freezes/21768/4
"i915.enable_psr=1"
# Better power management in 6.1 kernels
"amd_pstate=passive"
];
# This enables the brightness keys to work
# https://community.frame.work/t/12th-gen-not-sending-xf86monbrightnessup-down/20605/11
boot.blacklistedKernelModules = [ "hid-sensor-hub" ];
# Alder Lake CPUs benefit from kernel 5.18 for ThreadDirector
# https://www.tomshardware.com/news/intel-thread-director-coming-to-linux-5-18
boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.18") (lib.mkDefault pkgs.linuxPackages_latest);
# Fix TRRS headphones missing a mic # Fix TRRS headphones missing a mic
# https://community.frame.work/t/headset-microphone-on-linux/12387/3 # https://community.frame.work/t/headset-microphone-on-linux/12387/3
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
@ -65,9 +41,6 @@
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20" ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
''; '';
#scaling
# services.xserver.dpi = 227;
# Mis-detected by nixos-generate-config # Mis-detected by nixos-generate-config
# https://github.com/NixOS/nixpkgs/issues/171093 # https://github.com/NixOS/nixpkgs/issues/171093
# https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work # https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work