From ad148c9f399e577ea4f4ffaae7e6458e0b0f0d71 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 6 Jun 2025 23:55:22 -0400 Subject: [PATCH] override firmware to upgrade to kernel 6.15 and more --- flake.lock | 12 ++++----- hosts/eddie/boot.nix | 5 ++-- hosts/eddie/configuration.nix | 13 ++++++++++ hosts/eddie/hardware.nix | 8 +++--- modules/home/niri.nix | 4 +++ modules/system/openrazer.nix | 48 ----------------------------------- 6 files changed, 29 insertions(+), 61 deletions(-) delete mode 100644 modules/system/openrazer.nix diff --git a/flake.lock b/flake.lock index 39af09a..441c931 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1749232178, - "narHash": "sha256-pekC+SuqoHkoYPuWhC1aADCIP0cD3tvemu4WOF/JMUY=", + "lastModified": 1749262139, + "narHash": "sha256-BqCBEQl5WFxQOZubZQzP64cxS4c6tBTKb37tm6ziSYE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f6850858f78e2b6328f6e8bb7bf9df10dd0b7973", + "rev": "b284e9ae28347d2233cc5a6faa70fef7cb53945b", "type": "github" }, "original": { @@ -409,11 +409,11 @@ ] }, "locked": { - "lastModified": 1749243076, - "narHash": "sha256-r/LUy1XGeYR10O7tuSZ+Wn4LoXMwuO8T8t9whkvhtiA=", + "lastModified": 1749243446, + "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d595a5b64fb887dd67dd98866af30b1a37b0f7a", + "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "type": "github" }, "original": { diff --git a/hosts/eddie/boot.nix b/hosts/eddie/boot.nix index 72b9d41..87ebff5 100644 --- a/hosts/eddie/boot.nix +++ b/hosts/eddie/boot.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: - { # Bootloader. boot = { @@ -10,7 +9,7 @@ }; efi.canTouchEfiVariables = true; }; - kernelPackages = pkgs.linuxPackages_6_13; + kernelPackages = pkgs.linuxPackages_latest; kernelModules = [ "i2c-dev" "ddcci-backlight" @@ -20,7 +19,7 @@ ]; extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver - openrazer + # openrazer ]; extraModprobeConfig = '' options bluetooth disable_ertm=Y diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index b39c62a..1fb6589 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -32,6 +32,18 @@ inputs.nh.overlays.default inputs.emacs-lsp-booster.overlays.default + # temporary fix for wifi firmware until new version is released + (self: super: { + linux-firmware = super.linux-firmware.overrideAttrs (oldAttrs: { + version = "20250410"; + src = pkgs.fetchzip { + url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-20250410.tar.xz "; + hash = "sha256-aQdEl9+7zbNqWSII9hjRuPePvSfWVql5u5TIrGsa+Ao="; + }; + }); + }) + + # adds wine patch that makes softube plugin ui work (final: prev: { wineWowPackages.stagingFull = pkgs-stable.wineWowPackages.stagingFull.overrideAttrs (old: { @@ -42,6 +54,7 @@ }); }) + # adds newer bitwig version package. i'm sure this is a hack, but it works. (final: prev: { bitwig-studio5-3 = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override { bitwig-studio = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped; diff --git a/hosts/eddie/hardware.nix b/hosts/eddie/hardware.nix index 6e1bb76..4766ba6 100644 --- a/hosts/eddie/hardware.nix +++ b/hosts/eddie/hardware.nix @@ -17,10 +17,10 @@ }; i2c.enable = true; uinput.enable = true; - openrazer = { - enable = true; - users = [ "emenel" ]; - }; + # openrazer = { + # enable = true; + # users = [ "emenel" ]; + # }; graphics = { enable = true; enable32Bit = true; diff --git a/modules/home/niri.nix b/modules/home/niri.nix index cf346bc..5d3a65a 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -508,6 +508,10 @@ in hotkey-overlay.title = "Screenshot Window"; }; + "Mod+4" = { + action = screenshot; + hotkey-overlay.title = "Screenshot"; + }; # The quit action will show a confirmation dialog to avoid accidental exits. "Mod+Shift+E".action = quit; diff --git a/modules/system/openrazer.nix b/modules/system/openrazer.nix deleted file mode 100644 index e1a6b4f..0000000 --- a/modules/system/openrazer.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - config, - lib, - modulesPath, - pkgs, - ... -}: - -{ - # NIXPKGS-PR: 394300 - disabledModules = [ - "${modulesPath}/hardware/openrazer.nix" - ]; - imports = [ - (builtins.fetchurl { - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/4a11562c20fbe7af7d5ac139dbf0f8d50ce276f6/nixos/modules/hardware/openrazer.nix"; - sha256 = "0n6kzrcwlmxgws4pmffyqagp2rxpfxmfjl11vgvlkjcbglg6fs7y"; - }) - ]; - - hardware.openrazer = { - enable = true; - users = [ - "emenel" - ]; - # NIXPKGS-PR: 384992 - packages = let - oldVersion = pkgs.python3Packages.openrazer-daemon.version; - version = "3.10.1"; - in lib.mapAttrs (_: package: package.overrideAttrs (oldAttrs: { - version = lib.replaceStrings [ oldVersion ] [ version ] oldAttrs.version; - src = pkgs.fetchFromGitHub { - owner = "openrazer"; - repo = "openrazer"; - tag = "v${version}"; - hash = "sha256-igrGx7Y6ENtZatJCTAW43/0q6ZjljJ9/kU3QFli4yIU="; - }; - })) { - kernel = config.boot.kernelPackages.openrazer; - daemon = pkgs.python3Packages.openrazer-daemon; - }; - }; - - environment.systemPackages = with pkgs; [ - openrazer-daemon - polychromatic - ]; -}