why isnt this working argh
This commit is contained in:
parent
efb0cb00f3
commit
601780bd56
6 changed files with 111 additions and 74 deletions
|
|
@ -2,6 +2,9 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
users.users.jsutter = {
|
||||
isNormalUser = true;
|
||||
description = "Julian Sutter";
|
||||
|
|
@ -41,7 +44,7 @@
|
|||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# Flakes
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
|
|
@ -92,9 +95,6 @@
|
|||
|
||||
programs.java.enable = true;
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# System packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
|
|
@ -126,10 +126,10 @@ services.pcscd.enable = true;
|
|||
enable = true;
|
||||
pinentryFlavor = "gnome3";
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
||||
system.stateVersion = "23.05"; # Did you read the comment?
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,64 @@
|
|||
|
||||
{ config, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }: {
|
||||
|
||||
# CPU Stuff
|
||||
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault 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
|
||||
# https://community.frame.work/t/headset-microphone-on-linux/12387/3
|
||||
boot.extraModprobeConfig = ''
|
||||
options snd-hda-intel model=dell-headset-multi
|
||||
'';
|
||||
|
||||
# For fingerprint support
|
||||
services.fprintd.enable = lib.mkDefault true;
|
||||
|
||||
# FSTrim for the SSD
|
||||
services.fstrim.enable = lib.mkDefault true;
|
||||
|
||||
# Custom udev rules
|
||||
services.udev.extraRules = ''
|
||||
# Fix headphone noise when on powersave
|
||||
# https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55
|
||||
SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on"
|
||||
# Ethernet expansion card support
|
||||
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
|
||||
'';
|
||||
|
||||
# Mis-detected by nixos-generate-config
|
||||
# https://github.com/NixOS/nixpkgs/issues/171093
|
||||
# https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work
|
||||
hardware.acpilight.enable = lib.mkDefault true;
|
||||
|
||||
# Enable firmware updating
|
||||
services.fwupd.enable = true;
|
||||
|
||||
{
|
||||
# Power Stuff
|
||||
services.power-profiles-daemon.enable = false;
|
||||
services.tlp = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue