Regenerated

Droidnix/README.org

@@ -274,7 +274,6 @@ let
   grubThemeDir = "/boot/grub/themes/catppuccin-mocha";
   grubThemeFile = "${grubThemeDir}/theme.txt";
   plymouthThemeDir = "/usr/share/plymouth/themes/catppuccin";
-  plymouthSplash = "${flakeRoot}/assets/system/theming/boot/mocha.webp";
 in
 {
   boot = {
@@ -288,25 +287,32 @@ in
     kernelParams = [ "quiet" "udev.log_level=3" "systemd.show_status=auto" ];
     consoleLogLevel = 3;
 
-    # Filesystems supported at boot
     supportedFilesystems = [ "ntfs" ];
 
     # GRUB loader
-    loader.grub = {
-      enable = true;
-      efiSupport = true;
-      devices = [ "/dev/nvme0n1" ];  # <- must point to real disk
-      useOSProber = true;
+    loader = {
+      grub = {
+        enable = true;
+        devices = [ "/dev/nvme0n1" ];  # <- replace with your real boot disk
+        useOSProber = true;
+        theme = grubThemeFile;         # point GRUB to our theme
+      };
+
+      efi = {
+        enable = true;
+        canTouchEfiVariables = true;
+      };
+
+      timeout = 5;
     };
-    boot.efi.canTouchEfiVariables = true;
 
     # Plymouth splashscreen
     plymouth = {
       enable = true;
-      theme = "catppuccin";
+      theme = "rings";
       themePackages = with pkgs; [
         (adi1090x-plymouth-themes.override {
-          selected_themes = [ "spinner" ]; # default, overridden below
+          selected_themes = [ "rings" ];
         })
       ];
     };
@@ -317,7 +323,6 @@ in
     text = ''
       mkdir -p ${grubThemeDir}
 
-      # Write a simple theme.txt using Catppuccin Mocha colors
       cat > ${grubThemeFile} <<EOF
 # Catppuccin Mocha GRUB theme
 desktop-color = #1e1e2e
@@ -326,7 +331,6 @@ selected-item-color = #f5e0dc
 selected-item-highlight-color = #f5c2e7
 EOF
 
-      # Copy background image if it exists
       if [ -f "${flakeRoot}/assets/system/theming/boot/background.png" ]; then
         cp "${flakeRoot}/assets/system/theming/boot/background.png" "${grubThemeDir}/background.png"
       fi
@@ -334,19 +338,6 @@ EOF
       echo "GRUB Catppuccin Mocha theme installed."
     '';
   };
-
-  # Activation script: install Plymouth splash image
-  system.activationScripts.plymouthTheme = {
-    text = ''
-      if [ -f "${plymouthSplash}" ]; then
-        mkdir -p ${plymouthThemeDir}
-        cp "${plymouthSplash}" "${plymouthThemeDir}/splash.png"
-        update-alternatives --install /usr/share/plymouth/themes/default.plymouth default.plymouth \
-          ${plymouthThemeDir}/splash.png 100
-        echo "Plymouth Catppuccin splash installed."
-      fi
-    '';
-  };
 }
 #+END_SRC