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

why isnt this working argh

Browse source
This commit is contained in:
Julian Sutter 2023-01-23 04:42:10 +00:00
parent efb0cb00f3
commit 601780bd56
6 changed files with 111 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

37
flake.lock generated
View file

@ -1,5 +1,26 @@
{ {
"nodes": { "nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1674250603,
"narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "275ab728912006eecb549338a50f24f294a7cfb7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1672791794, "lastModified": 1672791794,
@ -17,8 +38,24 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
},
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

11
flake.nix
View file

@ -3,17 +3,22 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
home-manager = {
url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs }: { outputs = { self, nixpkgs, home-manager }: {
nixosConfigurations = { nixosConfigurations = {
framework = nixpkgs.lib.nixosSystem { framework = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ ./systems/common.nix modules = [ ./systems/common.nix
./hw-framework.nix
./systems/framework.nix ./systems/framework.nix
./user-jsutter.nix ]; /etc/nixos/hardware-configuration.nix
./user-jsutter.nix
];
}; };
aurora = nixpkgs.lib.nixosSystem { aurora = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";

61
hw-framework.nix
View file

@ -1,61 +0,0 @@
{ 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;
}

10
systems/common.nix
View file

@ -2,6 +2,9 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
nixpkgs.config.allowUnfree = true;
users.users.jsutter = { users.users.jsutter = {
isNormalUser = true; isNormalUser = true;
description = "Julian Sutter"; description = "Julian Sutter";
@ -92,9 +95,6 @@
programs.java.enable = true; programs.java.enable = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# System packages # System packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
@ -126,10 +126,10 @@ services.pcscd.enable = true;
enable = true; enable = true;
pinentryFlavor = "gnome3"; pinentryFlavor = "gnome3";
enableSSHSupport = true; enableSSHSupport = true;
}; };
services.openssh.enable = true; services.openssh.enable = true;
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05";
} }

61
systems/framework.nix
View file

@ -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 # Power Stuff
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = false;
services.tlp = { services.tlp = {

3
user-jsutter.nix
View file

@ -7,10 +7,9 @@ in
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
]; ];
home-manager.users.jsutter = { home-manager.users.jsutter = {
home.stateVersion = "22.11"; home.stateVersion = "23.05";
# Git Configuration # Git Configuration
programs.git = { programs.git = {