From 601780bd567390451178c23f09c3abcbd99c1b87 Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Mon, 23 Jan 2023 04:42:10 +0000 Subject: [PATCH] why isnt this working argh --- flake.lock | 37 ++++++++++++++++++++++++++ flake.nix | 11 +++++--- hw-framework.nix | 61 ------------------------------------------- systems/common.nix | 12 ++++----- systems/framework.nix | 61 +++++++++++++++++++++++++++++++++++++++++-- user-jsutter.nix | 3 +-- 6 files changed, 111 insertions(+), 74 deletions(-) delete mode 100644 hw-framework.nix diff --git a/flake.lock b/flake.lock index 7c174b6..93073a5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "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": { "locked": { "lastModified": 1672791794, @@ -17,8 +38,24 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "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", diff --git a/flake.nix b/flake.nix index 0dddc63..25e5633 100644 --- a/flake.nix +++ b/flake.nix @@ -3,17 +3,22 @@ inputs = { 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 = { framework = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./systems/common.nix - ./hw-framework.nix ./systems/framework.nix - ./user-jsutter.nix ]; + /etc/nixos/hardware-configuration.nix + ./user-jsutter.nix + ]; }; aurora = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/hw-framework.nix b/hw-framework.nix deleted file mode 100644 index 1285b50..0000000 --- a/hw-framework.nix +++ /dev/null @@ -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; - -} diff --git a/systems/common.nix b/systems/common.nix index 4f9f68f..11d9832 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -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"; } diff --git a/systems/framework.nix b/systems/framework.nix index 16ce34e..8307595 100644 --- a/systems/framework.nix +++ b/systems/framework.nix @@ -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 = { diff --git a/user-jsutter.nix b/user-jsutter.nix index 95e31db..a32d9d3 100644 --- a/user-jsutter.nix +++ b/user-jsutter.nix @@ -7,10 +7,9 @@ in (import "${home-manager}/nixos") ]; - home-manager.users.jsutter = { - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; # Git Configuration programs.git = {