system: add ucodenix to update microcode

use upstream bcachefs-tools flake use rc kernel, enable scx conditionally enable tpm2 home manager revamps
JohnRTitor · Aug 10, 2024 · 667acf8 · 667acf8
1 parent d1a718d
commit 667acf8
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 57 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
@@ -17,20 +17,42 @@
       android_sdk.accept_license = true;
     };
   };
+
+  specialArgs = {inherit self inputs pkgs-edge systemSettings userSettings;};
 in {
   flake = {
     nixosConfigurations.${systemSettings.hostname} = lib.nixosSystem {
-      specialArgs = {inherit self inputs systemSettings userSettings;};
+      inherit specialArgs;
       modules =
         [
-          {_module.args = {inherit pkgs-edge;};}
           ../default-host/configuration.nix # main nix configuration
           inputs.chaotic.nixosModules.default # chaotic nix bleeding edge packages
-          inputs.nur.nixosModules.nur
+          inputs.nur.nixosModules.nur # NUR - NixOS user repository
+          inputs.ucodenix.nixosModules.ucodenix # ucodeNix - CPU microcode updates
+          inputs.nix-flatpak.nixosModules.nix-flatpak # nix-flatpak, allows flatpak declaratively
+
+          # install home-manager as NixOS module
+          # so that it automatically gets deployed when running `nixos-rebuild switch`
+          inputs.home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              # backupFileExtension = ".hm.bak";
+              extraSpecialArgs =
+                specialArgs
+                // {
+                  # extra arguments for home-manager
+                };
+            };
 
-          # 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
+            home-manager.users.${userSettings.username} = {
+              imports = [
+                ../home-manager
+                inputs.nix-flatpak.homeManagerModules.nix-flatpak
+              ];
+            };
+          }
         ]
         ++ lib.optionals systemSettings.secureboot [inputs.lanzaboote.nixosModules.lanzaboote];
     };

diff --git a/home-manager/default.nix b/home-manager/default.nix
@@ -4,15 +4,11 @@
   lib,
   pkgs,
   pkgs-edge,
+  inputs,
   systemSettings,
   userSettings,
   ...
 }: {
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
-  home.username = userSettings.username;
-  home.homeDirectory = "/home/" + userSettings.username;
-
   imports =
     [
       # system packages are imported in ./configuration.nix

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
@@ -6,12 +6,12 @@
 }: let
   cfg = config.programs.uwsm;
   mk_uwsm_desktop_entry = opts: (pkgs.writeTextFile {
-    name = lib.traceVal "${opts.name}";
-    text = lib.traceVal ''
+    name = "${opts.name}";
+    text = ''
       [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";
@@ -30,8 +30,12 @@ in {
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [cfg.package];
     systemd.packages = [cfg.package];
+    environment.pathsToLink = [ "/share/uwsm" ];
+
+    # UWSM recommends dBus broker for better compatibility
     services.dbus.implementation = "broker";
 
+
     services.displayManager.sessionPackages =
       lib.optionals config.programs.hyprland.enable [
         (mk_uwsm_desktop_entry {

diff --git a/pkgs/global-packages.nix b/pkgs/global-packages.nix
@@ -10,9 +10,6 @@
   inputs,
   ...
 }: {
-  imports = [
-    inputs.nix-flatpak.nixosModules.nix-flatpak
-  ];
   environment.systemPackages =
     (with pkgs; [
       # System Packages

diff --git a/pkgs/user-packages.nix b/pkgs/user-packages.nix
@@ -9,9 +9,6 @@
   inputs,
   ...
 }: {
-  imports = [
-    inputs.nix-flatpak.homeManagerModules.nix-flatpak
-  ];
   home.packages =
     (with pkgs; [
       # here is some command line tools I use frequently

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/default.nix b/system/default.nix
@@ -12,10 +12,7 @@
       # include user account settings
       ./users.nix
       # include hardware settings
-      ./hardware/audio.nix
-      ./hardware/bluetooth.nix
-      ./hardware/disk.nix
-      ./hardware/graphics.nix
+      ./hardware
       # ./hardware/tpm.nix
       # include network settings
       ./network.nix

diff --git a/system/hardware/default.nix b/system/hardware/default.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  imports = [
+    ./audio.nix
+    ./bluetooth.nix
+    ./disk.nix
+    ./graphics.nix
+    ./tpm.nix
+  ];
+}
diff --git a/system/hardware/disk.nix b/system/hardware/disk.nix
@@ -23,7 +23,8 @@
     memoryPercent = 200;
   };
 
-  /* SWAP DELETED
+  /*
+     SWAP DELETED
   swapDevices = [
     {
       device = "/dev/disk/by-partuuid/90c8cb42-7424-467c-927a-0d6a63d5b2a2";

diff --git a/system/hardware/tpm.nix b/system/hardware/tpm.nix
@@ -6,6 +6,6 @@
 }: {
   security.tpm2.enable = true;
   security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
-  security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
-  users.users.${userSettings.username}.extraGroups = ["tss"]; # tss group has access to TPM devices
+  # security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
+  # users.users.${userSettings.username}.extraGroups = ["tss"]; # tss group has access to TPM devices
 }
diff --git a/system/hyprland/default.nix b/system/hyprland/default.nix
@@ -10,7 +10,10 @@
   ...
 }: let
   hyprlandFlake = true;
-  pkgs-hyprland = if hyprlandFlake then inputs.hyprland.packages.${pkgs.system} else pkgs;
+  pkgs-hyprland =
+    if hyprlandFlake
+    then inputs.hyprland.packages.${pkgs.system}
+    else pkgs;
   python-packages = pkgs.python3.withPackages (
     ps:
       with ps; [
@@ -26,7 +29,8 @@ in {
     package =
       (pkgs-hyprland.hyprland.override {
         #stdenv = pkgs.clangStdenv;
-      }).overrideAttrs
+      })
+      .overrideAttrs
       (prevAttrs: {
         patches =
           (prevAttrs.patches or [])

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";
 }
diff --git a/system/users.nix b/system/users.nix
@@ -26,15 +26,4 @@
       then pkgs.zsh
       else pkgs.bash;
   };
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    # backupFileExtension = ".hm.bak";
-
-    users.${userSettings.username} = import ../home-manager;
-    extraSpecialArgs = {
-      inherit self inputs pkgs-edge systemSettings userSettings;
-    };
-  };
 }