diff --git a/graphical/boot.nix b/graphical/boot.nix index 61b38de..146f2a1 100644 --- a/graphical/boot.nix +++ b/graphical/boot.nix @@ -1,9 +1,53 @@ { config, scope, + machineName, + mainUser, ... }: scope "boot" { tmp.useTmpfs = true; initrd.systemd.enable = true; + + loader.limine = { + enable = true; + style = + let + pal = config.rice.palette.shortHex; + in + { + wallpapers = [ config.rice.bg.src ]; + interface = { + brandingColor = 1; + branding = "hello ${mainUser}. welcome to ${machineName}"; + }; + graphicalTerminal = + let + getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";"; + in + { + palette = getPal pal.normal; + brightPalette = getPal pal.bright; + marginGradient = 0; + margin = 256; + foreground = pal.util.fg; + background = "20" + pal.util.bg; + brightForeground = pal.bright.yellow; + brightBackground = pal.util.bg; + }; + backdrop = pal.util.bg; + }; + maxGenerations = 5; + }; + plymouth = { + enable = true; + # theme needs fixing + # inherit (config.rice.plymouth) theme themePackages font; + }; + + loader.limine.extraEntries = '' + /Windows + protocol: efi + path: boot():/EFI/Microsoft/Boot/bootmgfw.efi + ''; } diff --git a/hosts/adrift/boot.nix b/hosts/adrift/boot.nix index 6ea7b57..2e3210d 100644 --- a/hosts/adrift/boot.nix +++ b/hosts/adrift/boot.nix @@ -20,10 +20,10 @@ scope "boot" { "iwlwifi" "kvm-intel" ]; - loader.systemd-boot = { - enable = true; - consoleMode = "max"; - configurationLimit = 5; - }; + # loader.systemd-boot = { + # enable = true; + # consoleMode = "max"; + # configurationLimit = 5; + # }; loader.efi.canTouchEfiVariables = true; } diff --git a/hosts/quiver/boot.nix b/hosts/quiver/boot.nix index 475ca5f..9280201 100644 --- a/hosts/quiver/boot.nix +++ b/hosts/quiver/boot.nix @@ -1,36 +1,9 @@ -{ scope, pkgs, config, ...}: +{ + scope, + ... +}: scope "boot" { - loader.limine = { - enable = true; - style = - let - pal = config.rice.palette.shortHex; - in - { - wallpapers = [ config.rice.bg.src ]; - interface = { - brandingColor = 1; - branding = "welcome to quiver"; - }; - graphicalTerminal = - let - getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";"; - in - { - palette = getPal pal.normal; - brightPalette = getPal pal.bright; - marginGradient = 0; - margin = 256; - foreground = pal.util.fg; - background = "20" + pal.util.bg; - brightForeground = pal.bright.yellow; - brightBackground = pal.util.bg; - }; - backdrop = pal.util.bg; - }; - maxGenerations = 5; - }; - + initrd.availableKernelModules = [ "xhci_pci" "ahci" @@ -58,15 +31,5 @@ scope "boot" { btrfs = true; }; loader.efi.canTouchEfiVariables = true; - plymouth = { - enable = true; - # theme needs fixing - # inherit (config.rice.plymouth) theme themePackages font; - }; - loader.limine.extraEntries = '' - /Windows - protocol: efi - path: boot():/EFI/Microsoft/Boot/bootmgfw.efi - ''; } diff --git a/lib/create.nix b/lib/create.nix index 84007e2..5860c21 100644 --- a/lib/create.nix +++ b/lib/create.nix @@ -19,6 +19,7 @@ in }; scope = import ./scope.nix { inherit lib; }; mainUser = info.username; + machineName = name; getPkgs = builtins.attrValues; getFlakePkg = p: p.packages.${info.system}.default; getFlakePkg' = p: n: p.packages.${info.system}.${n};