diff --git a/flake.lock b/flake.lock index e30e694..01a13aa 100644 --- a/flake.lock +++ b/flake.lock @@ -160,6 +160,24 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -314,6 +332,21 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1774388614, @@ -362,6 +395,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -483,10 +532,30 @@ "noctalia": "noctalia", "nur": "nur", "openmw": "openmw", + "seamless-asahi-plymouth": "seamless-asahi-plymouth", "sops-nix": "sops-nix", "tt-schemes": "tt-schemes" } }, + "seamless-asahi-plymouth": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1770365598, + "narHash": "sha256-tjmDL8eaK2NIwWDho81GhygkBZoauiiiUqwV1VP1FwQ=", + "owner": "luca-schlecker", + "repo": "seamless-asahi-plymouth", + "rev": "e3f5517643f9c2021bee2870b55d8bd363763cd1", + "type": "github" + }, + "original": { + "owner": "luca-schlecker", + "repo": "seamless-asahi-plymouth", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 55809e3..e35e4a6 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; apple-silicon.url = "github:nix-community/nixos-apple-silicon"; + seamless-asahi-plymouth.url = "github:luca-schlecker/seamless-asahi-plymouth"; base16.url = "github:SenchoPens/base16.nix"; tt-schemes = { @@ -66,6 +67,7 @@ nixpkgs-unstable, nix-cachyos-kernel, apple-silicon, + seamless-asahi-plymouth, base16, tt-schemes, sops-nix, @@ -250,6 +252,7 @@ peach = mkNixosSystem { hostname = "peach"; system = "aarch64-linux"; + extraSpecialArgs = { inherit seamless-asahi-plymouth; }; extraModules = [ apple-silicon.nixosModules.default { nixpkgs.overlays = [ apple-silicon.overlays.apple-silicon-overlay ]; } diff --git a/system/default.nix b/system/default.nix index 0f96e81..f2e8dff 100755 --- a/system/default.nix +++ b/system/default.nix @@ -22,22 +22,23 @@ plymouth.logo = "${pkgs.nixos-icons}/share/icons/hicolor/64x64/apps/nix-snowflake-white.png"; loader = { timeout = 3; - limine = { - enable = true; - maxGenerations = 10; - extraConfig = '' - timeout: 3 - ''; - style = { - wallpapers = [ ]; - wallpaperStyle = "stretched"; - backdrop = "#1e1e2e"; - interface = { - branding = "kova's nixos!"; - brandingColor = 5; - }; - }; - }; + systemd-boot.enable = true; + # limine = { + # enable = true; + # maxGenerations = 10; + # extraConfig = '' + # timeout: 3 + # ''; + # style = { + # wallpapers = [ ]; + # wallpaperStyle = "stretched"; + # backdrop = "#1e1e2e"; + # interface = { + # branding = "kova's nixos!"; + # brandingColor = 5; + # }; + # }; + # }; }; kernelParams = [ "quiet" diff --git a/system/hosts/peach/apple-rainbow.png b/system/hosts/peach/apple-rainbow.png new file mode 100644 index 0000000..84e7598 Binary files /dev/null and b/system/hosts/peach/apple-rainbow.png differ diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix index 22394cc..a24c60b 100644 --- a/system/hosts/peach/default.nix +++ b/system/hosts/peach/default.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + seamless-asahi-plymouth, ... }: let @@ -13,10 +14,42 @@ let }; in { + + nixpkgs.overlays = [ + (final: prev: { + uboot-asahi = prev.uboot-asahi.overrideAttrs (old: { + postConfigure = (old.postConfigure or "") + '' + cat >> .config <<'EOF' + # CONFIG_VIDEO_LOGO is not set + CONFIG_BOOTDELAY=0 + CONFIG_SILENT_CONSOLE=y + CONFIG_PREBOOT="setenv silent 1" + EOF + + # Regenerate the configuration with new flags + make olddefconfig + ''; + }); + }) + ]; + boot = { kernelParams = [ "appledrm.show_notch=1" ]; + # thank you to u/douv: + # https://www.reddit.com/r/AsahiLinux/comments/1sb8cby/retro_boot_logo/ m1n1CustomLogo = "${asahi-artwork}/logos/png_256/AsahiLinux_logomark.png"; - plymouth.logo = lib.mkForce "${asahi-artwork}/logos/png_64/AsahiLinux_logomark.png"; + plymouth = { + enable = true; + theme = "seamless-asahi"; + themePackages = [ + (seamless-asahi-plymouth.packages.${pkgs.system}.default.override { + logo = "${asahi-artwork}/logos/png_64/AsahiLinux_logomark.png"; + }) + ]; + extraConfig = '' + DeviceScale=1 + ''; + }; }; programs.dconf.profiles.gdm.databases = [