update git auto sync, tweaks to shared modules and theming, updated plymouth boot to use script instead of simple stepper

.ignore

@@ -1,7 +1,8 @@
 # dotfiles/
 .git/
 flake.lock
-frame12/framework-plymouth-theme/framework/throbber-*
+frame12/framework-plymouth-theme/framework/progress-*
+jaci/kiki-plymouth-theme/*/progress-*
 
 *.png
 *.jpeg

flake.nix

@@ -106,24 +106,25 @@
             ./jaci/default.nix
         ];
       };
-      scrappy = nixpkgs.lib.nixosSystem {
-        # Pass args to desktop configuration
-        specialArgs = {
-            inherit inputs outputs timeZone system;
-        };
-        modules = [
-            # Setup home manager
-            inputs.home-manager.nixosModules.home-manager {
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.users.scrappy = import ./scrappy/modules/home-manager/home.nix;
-                home-manager.extraSpecialArgs = {
-                    inherit inputs outputs unstablePkgs;
-                };
-            }
-            ./scrappy/default.nix
-        ];
-      };
+      # DEPRECATED: scrappy system is no longer in use
+      # scrappy = nixpkgs.lib.nixosSystem {
+      #   # Pass args to desktop configuration
+      #   specialArgs = {
+      #       inherit inputs outputs timeZone system;
+      #   };
+      #   modules = [
+      #       # Setup home manager
+      #       inputs.home-manager.nixosModules.home-manager {
+      #           home-manager.useGlobalPkgs = true;
+      #           home-manager.useUserPackages = true;
+      #           home-manager.users.scrappy = import ./scrappy/modules/home-manager/home.nix;
+      #           home-manager.extraSpecialArgs = {
+      #               inherit inputs outputs unstablePkgs;
+      #           };
+      #       }
+      #       ./scrappy/default.nix
+      #   ];
+      # };
       frame12 = nixpkgs.lib.nixosSystem {
         # Pass args to desktop configuration
         specialArgs = {

frame12/default.nix

@@ -16,66 +16,16 @@
   deskCfg = {
       userName = userName;
       hostName = hostName;
+      fullName = fullName;
       de = desktop;
   };
 
-  # Stylix theming
-  stylix = {
-    enable = true;
-    image = ./wallpaper.png;
-
-    # Check with `nix build nixpkgs#base16-schemes && ls result/share/themes`
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/woodland.yaml";
-    polarity = "dark";
-
-    # System-wide cursor
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Classic";
-      size = 32;
-    };
-
-    # Fonts
-    fonts = {
-      serif = {
-        package = pkgs.lato;
-        name = "Lato";
-      };
-      sansSerif = {
-        package = pkgs.lato;
-        name = "Lato";
-      };
-      monospace = {
-        package = pkgs.maple-mono.NF;
-        name = "Maple Mono NF";
-      };
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-      sizes = {
-        applications = 14;
-        desktop = 12;
-        popups = 12;
-        terminal = 16;
-      };
-    };
-
-    # Icon theme for tray applets (nm-applet, etc.)
-    iconTheme = {
-      enable = true;
-      package = pkgs.papirus-icon-theme;
-      light = "Papirus-Light";
-      dark = "Papirus-Dark";
-    };
-
-    # Keep custom Framework plymouth theme
-    targets.plymouth.enable = false;
-  };
-
   # Limit the number of generations to keep
   boot.loader.systemd-boot.configurationLimit = 5;
 
+  # Systemd initrd for Plymouth and faster boot
+  boot.initrd.systemd.enable = true;
+
   # Perform garbage collection weekly to maintain low disk usage
   nix.gc = {
     automatic = true;

frame12/desktop-configuration.nix

@@ -28,10 +28,15 @@ in
       type = lib.types.str;
       description = "Hostname for system";
     };
+    fullName = lib.mkOption {
+      type = lib.types.str;
+      default = "User";
+      description = "Full display name for the user";
+    };
   };
 
   imports = [
-    modules/user/main_user.nix
+    ../shared/modules/user/main_user.nix
     modules/niri/niri_conf.nix
     modules/colemak-ec.nix
     ../shared/modules/system/power_manager.nix
@@ -46,6 +51,60 @@ in
       }
     ];
 
+    # Stylix theming
+    stylix = {
+      enable = true;
+      image = ./wallpaper.png;
+
+      # Check with `nix build nixpkgs#base16-schemes && ls result/share/themes`
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/woodland.yaml";
+      polarity = "dark";
+
+      # System-wide cursor
+      cursor = {
+        package = pkgs.bibata-cursors;
+        name = "Bibata-Modern-Classic";
+        size = 32;
+      };
+
+      # Fonts
+      fonts = {
+        serif = {
+          package = pkgs.lato;
+          name = "Lato";
+        };
+        sansSerif = {
+          package = pkgs.lato;
+          name = "Lato";
+        };
+        monospace = {
+          package = pkgs.maple-mono.NF;
+          name = "Maple Mono NF";
+        };
+        emoji = {
+          package = pkgs.noto-fonts-color-emoji;
+          name = "Noto Color Emoji";
+        };
+        sizes = {
+          applications = 14;
+          desktop = 12;
+          popups = 12;
+          terminal = 16;
+        };
+      };
+
+      # Icon theme for tray applets (nm-applet, etc.)
+      iconTheme = {
+        enable = true;
+        package = pkgs.papirus-icon-theme;
+        light = "Papirus-Light";
+        dark = "Papirus-Dark";
+      };
+
+      # Keep custom Framework plymouth theme
+      targets.plymouth.enable = false;
+    };
+
     nixpkgs.overlays = [
       inputs.nur.overlays.default
     ];
@@ -71,14 +130,10 @@ in
             cp -r ${./framework-plymouth-theme/framework}/* $out/share/plymouth/themes/framework/
             substituteInPlace $out/share/plymouth/themes/framework/framework.plymouth \
               --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/framework"
+            substituteInPlace $out/share/plymouth/themes/framework/framework.script \
+              --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/framework"
           '')
         ];
-        # themePackages = with pkgs; [
-        #   # By default we would install all themes
-        #   (adi1090x-plymouth-themes.override {
-        #     selected_themes = [ "circuit" "circle_flow" ];
-        #   })
-        # ];
       };
 
       # Enable "Silent Boot"
@@ -112,7 +167,9 @@ in
     main_user = {
       enable = true;
       userName = deskCfg.userName;
+      fullName = deskCfg.fullName;
       isDesktopUser = true;
+      extraGroups = [ "corectrl" "dialout" "docker" ];
     };
 
     power_manager = {

frame12/framework-plymouth-theme/framework/framework.plymouth

@@ -1,54 +1,8 @@
 [Plymouth Theme]
 Name=Framework
 Description=Theme with animated Framework logo.
-ModuleName=two-step
+ModuleName=script
 
-[two-step]
-Font=Cantarell 12
-TitleFont=Cantarell Light 30
+[script]
 ImageDir=@IMAGEDIR@
-DialogHorizontalAlignment=.5
-DialogVerticalAlignment=.382
-TitleHorizontalAlignment=.5
-TitleVerticalAlignment=.382
-HorizontalAlignment=.5
-VerticalAlignment=.5
-WatermarkHorizontalAlignment=.5
-WatermarkVerticalAlignment=.96
-Transition=none
-TransitionDuration=0.0
-BackgroundStartColor=0x000000
-BackgroundEndColor=0x000000
-ProgressBarBackgroundColor=0x606060
-ProgressBarForegroundColor=0xffffff
-MessageBelowAnimation=true
-
-[boot-up]
-UseEndAnimation=false
-
-[shutdown]
-UseEndAnimation=false
-
-[reboot]
-UseEndAnimation=false
-
-[updates]
-SuppressMessages=true
-ProgressBarShowPercentComplete=true
-UseProgressBar=true
-Title=Installing Updates...
-SubTitle=Do not turn off your computer
-
-[system-upgrade]
-SuppressMessages=true
-ProgressBarShowPercentComplete=true
-UseProgressBar=true
-Title=Upgrading System...
-SubTitle=Do not turn off your computer
-
-[firmware-upgrade]
-SuppressMessages=true
-ProgressBarShowPercentComplete=true
-UseProgressBar=true
-Title=Upgrading Firmware...
-SubTitle=Do not turn off your computer
+ScriptFile=@IMAGEDIR@/framework.script

frame12/framework-plymouth-theme/framework/framework.script

@@ -0,0 +1,110 @@
+// Framework Plymouth Theme Script
+// Adapted from adi1090x plymouth-themes template
+// Original artwork credit: sniss https://community.frame.work/t/framework-fan-art/6626/39
+
+// Screen size
+screen.w = Window.GetWidth(0);
+screen.h = Window.GetHeight(0);
+screen.half.w = Window.GetWidth(0) / 2;
+screen.half.h = Window.GetHeight(0) / 2;
+
+// Question prompt
+question = null;
+answer = null;
+
+// Message
+message = null;
+
+// Password prompt
+bullets = null;
+prompt = null;
+bullet.image = Image.Text("*", 1, 1, 1);
+
+// Flow
+state.status = "play";
+state.time = 0.0;
+
+//--------------------------------- Refresh (Logo animation) --------------------------
+
+// Frame count: 232 frames (0-231)
+frame_count = 232;
+
+// Load all animation frames
+for (i = 0; i < frame_count; i++)
+  frame_image[i] = Image("progress-" + i + ".png");
+frame_sprite = Sprite();
+
+// Set image position (centered)
+frame_sprite.SetX(Window.GetX() + (Window.GetWidth(0) / 2 - frame_image[0].GetWidth() / 2));
+frame_sprite.SetY(Window.GetY() + (Window.GetHeight(0) / 2 - frame_image[0].GetHeight() / 2));
+
+progress = 0;
+
+fun refresh_callback ()
+  {
+    // Speed divisor of 3 for smooth 232-frame animation
+    frame_sprite.SetImage(frame_image[Math.Int(progress / 3) % frame_count]);
+    progress++;
+  }
+
+Plymouth.SetRefreshFunction (refresh_callback);
+
+//------------------------------------- Question prompt -------------------------------
+fun DisplayQuestionCallback(prompt, entry) {
+    question = null;
+    answer = null;
+
+    if (entry == "")
+        entry = "<answer>";
+
+    question.image = Image.Text(prompt, 1, 1, 1);
+    question.sprite = Sprite(question.image);
+    question.sprite.SetX(screen.half.w - question.image.GetWidth() / 2);
+    question.sprite.SetY(screen.h - 4 * question.image.GetHeight());
+
+    answer.image = Image.Text(entry, 1, 1, 1);
+    answer.sprite = Sprite(answer.image);
+    answer.sprite.SetX(screen.half.w - answer.image.GetWidth() / 2);
+    answer.sprite.SetY(screen.h - 2 * answer.image.GetHeight());
+}
+Plymouth.SetDisplayQuestionFunction(DisplayQuestionCallback);
+
+//------------------------------------- Password prompt (LUKS) ------------------------
+fun DisplayPasswordCallback(nil, bulletCount) {
+    state.status = "pause";
+    totalWidth = bulletCount * bullet.image.GetWidth();
+    startPos = screen.half.w - totalWidth / 2;
+
+    prompt.image = Image.Text("Enter Password", 1, 1, 1);
+    prompt.sprite = Sprite(prompt.image);
+    prompt.sprite.SetX(screen.half.w - prompt.image.GetWidth() / 2);
+    prompt.sprite.SetY(screen.h - 4 * prompt.image.GetHeight());
+
+    // Clear all bullets (user might hit backspace)
+    bullets = null;
+    for (i = 0; i < bulletCount; i++) {
+        bullets[i].sprite = Sprite(bullet.image);
+        bullets[i].sprite.SetX(startPos + i * bullet.image.GetWidth());
+        bullets[i].sprite.SetY(screen.h - 2 * bullet.image.GetHeight());
+    }
+}
+Plymouth.SetDisplayPasswordFunction(DisplayPasswordCallback);
+
+//--------------------------- Normal display (unset all text) ----------------------
+fun DisplayNormalCallback() {
+    state.status = "play";
+    bullets = null;
+    prompt = null;
+    message = null;
+    question = null;
+    answer = null;
+}
+Plymouth.SetDisplayNormalFunction(DisplayNormalCallback);
+
+//----------------------------------------- Message --------------------------------
+fun MessageCallback(text) {
+    message.image = Image.Text(text, 1, 1, 1);
+    message.sprite = Sprite(message.image);
+    message.sprite.SetPosition(screen.half.w - message.image.GetWidth() / 2, message.image.GetHeight());
+}
+Plymouth.SetMessageFunction(MessageCallback);