system: add ucodenix to update microcode

use upstream bcachefs-tools flake use rc kernel, enable scx conditionally
JohnRTitor · Aug 10, 2024 · 255860b · 255860b
1 parent d1a718d
commit 255860b
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -71,6 +71,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-parts.follows = "flake-parts";
     };
+
+    ucodenix.url = "github:e-tho/ucodenix";
     browser-previews = {
       url = "github:nix-community/browser-previews"; # Latest Chrome stable, beta, and dev
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/flake/hosts.nix b/flake/hosts.nix
@@ -31,6 +31,8 @@ in {
           # make home-manager as a module of nixos
           # so that home-manager configuration will be deployed automatically when executing `nixos-rebuild switch`
           inputs.home-manager.nixosModules.default
+
+          inputs.ucodenix.nixosModules.ucodenix
         ]
         ++ lib.optionals systemSettings.secureboot [inputs.lanzaboote.nixosModules.lanzaboote];
     };

diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix
@@ -12,7 +12,7 @@
 
   nixpkgs.overlays = [
     (final: prev: {
-      # bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
+      bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
     })
   ];
 

diff --git a/modules-overlays/uwsm/module.nix b/modules-overlays/uwsm/module.nix
@@ -11,7 +11,7 @@
       [Desktop Entry]
       Name=${opts.compositor_pretty_name} (with UWSM)
       Comment=${opts.compositor_comment}
-      Exec=${lib.getExe cfg.package} start -S -- "${opts.compositor_bin_path}"
+      Exec=${lib.getExe cfg.package} start -S -F "${opts.compositor_bin_path}"
       Type=Application
     '';
     destination = "/share/wayland-sessions/${opts.name}_uwsm.desktop";

diff --git a/system/boot/kernel.nix b/system/boot/kernel.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: {
-  boot.kernelPackages = pkgs.linuxPackages_cachyos-lto;
+  boot.kernelPackages = pkgs.linuxPackages_testing;
 
   boot.extraModulePackages = with config.boot.kernelPackages; [
     # zenpower is used for reading temperature, voltage, current and power

diff --git a/system/services/default.nix b/system/services/default.nix
@@ -1,5 +1,6 @@
 # Configure system services
 {
+  config,
   lib,
   pkgs,
   systemSettings,
@@ -24,7 +25,7 @@
   };
 
   # Enable scx extra schedulers, only available for linux-cachyos
-  chaotic.scx.enable = true; # by default uses rustland
+  chaotic.scx.enable = (config.boot.kernelPackages.kernel.passthru.config.CONFIG_SCHED_CLASS_EXT or null) == "y"; # by default uses rustland
   chaotic.scx.scheduler = "scx_bpfland";
 
   # Accounts daemon is needed to remember passwords and other account information
@@ -92,4 +93,7 @@
   security.polkit.enable = true; # Enable polkit for elevated prompts
 
   # services.colord.enable = true; # For color management
+
+  services.ucodenix.enable = true;
+  services.ucodenix.cpuSerialNumber = "00A6-0F12-0000-0000-0000-0000";
 }