treewide: remove some workarounds

linyinfeng · Oct 4, 2024 · e34e7d5 · e34e7d5
1 parent 9972419
commit e34e7d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/flake/nixpkgs.nix b/flake/nixpkgs.nix
@@ -162,10 +162,11 @@ let
  inherit (alternativeChannels nixpkgsArgs) latest unstable-small stable;
  in
  [
- (_final: _prev: {
- # TODO wait for https://nixpkgs-tracker.ocfox.me/?pr=341520
- inherit (unstable-small) waybar;
- })
+ (
+ _final: _prev:
+ {
+ }
+ )
  ];
 in
 {

diff --git a/nixos/hosts/framework/_hardware.nix b/nixos/hosts/framework/_hardware.nix
@@ -1,22 +1,14 @@
 # https://github.com/NixOS/nixos-hardware/blob/master/framework/13-inch/12th-gen-intel/default.nix
 {
- inputs,
  config,
  pkgs,
  lib,
  ...
 }:
 lib.mkMerge [
  {
- # TODO wait for https://nixpkgs-tracker.ocfox.me/?pr=335482
- # boot.extraModulePackages = with config.boot.kernelPackages; [
- # framework-laptop-kmod
- # ];
- boot.extraModulePackages = [
- (config.boot.kernelPackages.callPackage
- "${inputs.nixpkgs-unstable-small}/pkgs/os-specific/linux/framework-laptop-kmod/default.nix"
- { }
- )
+ boot.extraModulePackages = with config.boot.kernelPackages; [
+ framework-laptop-kmod
  ];
  }