From e6380d441fac29046c4ad4027f4be55ae5c90543 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Tue, 25 Mar 2025 15:23:27 +0100 Subject: [PATCH] Add fallback kernels --- home-mods/activity-watch/default.nix | 8 +++--- home-mods/firefox/_base.nix | 2 +- os-mods/amdgpu/default.nix | 10 ++++---- pkgs/miraclecast.nix | 38 ++++++++++++++-------------- systems/nixos-fw16/default.nix | 11 ++++++++ 5 files changed, 40 insertions(+), 29 deletions(-) diff --git a/home-mods/activity-watch/default.nix b/home-mods/activity-watch/default.nix index d95387a..104dd14 100644 --- a/home-mods/activity-watch/default.nix +++ b/home-mods/activity-watch/default.nix @@ -8,16 +8,16 @@ # aw-watcher-window-wayland # does not support kwin wayland # aw-webui # python312Packages.aw-core - aw-server-rust - awatcher + # aw-server-rust + # awatcher ]; programs.firefox.profiles.default.extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ - aw-watcher-web + # aw-watcher-web ]; services.activitywatch = { - enable = true; + # enable = true; package = pkgs.aw-server-rust; watchers = { awatcher.package = pkgs.awatcher; diff --git a/home-mods/firefox/_base.nix b/home-mods/firefox/_base.nix index 19f9a3a..996d1c2 100644 --- a/home-mods/firefox/_base.nix +++ b/home-mods/firefox/_base.nix @@ -288,7 +288,7 @@ sponsorblock tab-stash ublock-origin - pkgs.nur.repos.bhasherbel.aw-awatcher + # pkgs.nur.repos.bhasherbel.aw-awatcher ]; # TODO Reenable when fixed (currently works for setup but default settings is broken due to https://github.com/nix-community/home-manager/pull/6505#issuecomment-2673463728) diff --git a/os-mods/amdgpu/default.nix b/os-mods/amdgpu/default.nix index 79c44a3..e5a9e36 100644 --- a/os-mods/amdgpu/default.nix +++ b/os-mods/amdgpu/default.nix @@ -4,10 +4,10 @@ , inputs , ... }: { - programs.corectrl = { - enable = false; - gpuOverclock.enable = true; - }; + # programs.corectrl = { + # enable = false; + # gpuOverclock.enable = true; + # }; systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" @@ -52,7 +52,7 @@ }; systemd.services.lactd = { - enable = true; + # enable = true; description = "Radeon GPU monitor"; after = [ "syslog.target" "systemd-modules-load.service" ]; diff --git a/pkgs/miraclecast.nix b/pkgs/miraclecast.nix index 681a386..f46f858 100644 --- a/pkgs/miraclecast.nix +++ b/pkgs/miraclecast.nix @@ -1,22 +1,22 @@ -{ - lib, - fetchFromGitHub, - glib, - gst_all_1, - iproute2, - libtool, - makeBinaryWrapper, - meson, - miraclecast, - ninja, - pkg-config, - readline, - stdenv, - systemdLibs, - testers, - udev, - wpa_supplicant, - relyUdev ? true, +{ lib +, fetchFromGitHub +, glib +, gst_all_1 +, iproute2 +, libtool +, makeBinaryWrapper +, meson +, miraclecast +, ninja +, pkg-config +, readline +, stdenv +, systemdLibs +, testers +, udev +, wpa_supplicant +, relyUdev ? true +, }: let diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix index 61d4d5e..e46f68c 100644 --- a/systems/nixos-fw16/default.nix +++ b/systems/nixos-fw16/default.nix @@ -127,6 +127,17 @@ }; }; + specialisation = { + linux-latest.configuration = { + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; # bootstrap + }; + linux-lts.configuration = { + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_lts; # bootstrap + }; + linux-zen.configuration = { + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_zen; # bootstrap + }; + }; boot = { # kernelPackages = pkgs.linuxPackages_latest; # bootstrap # kernelPackages = pkgs.linuxPackages_zen; # bootstrap