Regenerated

Droidnix/README.org

@@ -271,43 +271,63 @@ in
 { pkgs, config, lib, flakeRoot, ... }:
 
 let
-  grubThemeDir = "/boot/grub/themes/catppuccin-mocha";
-  grubThemeFile = "${grubThemeDir}/theme.txt";
+grubTheme = "${flakeRoot}/assets/system/theming/boot";
 in
 {
-  boot.loader.grub = {
-    enable = true;
-    efiSupport = true;
-    devices = [ "nodev" ];
-    useOSProber = true;
-    theme = grubThemeFile;
+  ############################
+  # Bootloader (GRUB)
+  ############################
+  boot.loader = {
     timeout = 5;
+
+    grub = {
+      enable = true;
+      efiSupport = true;
+      devices = [ "nodev" ];
+      useOSProber = true;
+
+      # Proper declarative theme
+      theme = "${grubTheme}/theme.txt";
+    };
   };
 
+  ############################
+  # Kernel / boot settings
+  ############################
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = [ "quiet" "udev.log_level=3" "systemd.show_status=auto" ];
-  boot.consoleLogLevel = 3;
+
+  boot.kernelParams = [
+    "quiet"
+    "splash"                 # REQUIRED for plymouth
+    "udev.log_level=3"
+    "rd.systemd.show_status=false"
+  ];
+
+  boot.consoleLogLevel = 0;
+
   boot.supportedFilesystems = [ "ntfs" ];
 
-  # Activation script for theme + background
-  system.activationScripts.grubTheme = {
-    text = ''
-      mkdir -p ${grubThemeDir}
+  ############################
+  # Plymouth (FIXED)
+  ############################
+  boot.plymouth = {
+    enable = true;
+    theme = "rings";
 
-      cat > ${grubThemeFile} <<EOF
-# Catppuccin Mocha GRUB theme
-desktop-color = #1e1e2e
-normal-color  = #cdd6f4
-selected-item-color = #f5e0dc
-selected-item-highlight-color = #f5c2e7
-EOF
-
-      if [ -f "${flakeRoot}/assets/system/theming/boot/background.png" ]; then
-        cp "${flakeRoot}/assets/system/theming/boot/background.png" "${grubThemeDir}/background.png"
-      fi
-      echo "GRUB Catppuccin Mocha theme installed and config updated."
-    '';
+    themePackages = [
+      (pkgs.adi1090x-plymouth-themes.override {
+        selected_themes = [ "rings" ];
+      })
+    ];
   };
+
+  # CRITICAL: ensures plymouth starts early in initrd
+  boot.initrd.systemd.enable = true;
+
+  ############################
+  # Required (avoid warnings)
+  ############################
+  system.stateVersion = "26.05";
 }
 #+END_SRC