refactor: update plymouth, remove some useless code
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2023-12-30 00:06:27 -05:00
parent ebd34a9481
commit 4a85e1c402
7 changed files with 33 additions and 33 deletions

View file

@ -1,14 +1,16 @@
final: prev: {
plymouth = prev.plymouth.overrideAttrs (o: {
# https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/236
version = "unstable-2023-06-17";
version = "unstable-2023-12-08";
src = prev.fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "plymouth";
repo = "plymouth";
rev = "b1d5aa9d2a6033bba52cf63643e5878f8a9b68a0";
hash = "sha256-8DXcwt8CZTni5Ma+I63LzNejlIB0Cr1ATA7Nl3z9z6I=";
# https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/236
# Last commit that works
rev = "58cc9f84e456ab0510b13d7bdbc13697467ca7be";
hash = "sha256-hgQ8nCphR4hc+WTNtS8GgBrC54uYnvTCp7kjgB/u5lE=";
};
});
}

View file

@ -5,6 +5,7 @@
pkgs,
...
}: {
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot = {
@ -71,6 +72,4 @@
qemu
virtiofsd
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -6,8 +6,10 @@
nixpkgs.hostPlatform = "x86_64-linux";
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
services.logind.lidSwitchExternalPower = "ignore";
services.logind.lidSwitchDocked = "ignore";
services.logind = {
lidSwitchDocked = "ignore";
lidSwitchExternalPower = "ignore";
};
boot = {
loader = {

View file

@ -1,6 +1,7 @@
{config, ...}: let
servivi = "100.64.0.7";
in {
# https://nixos.wiki/wiki/Distributed_build
home-manager.users.root = {
home.file.".ssh/config".text = ''
Host ${servivi}
@ -17,7 +18,8 @@ in {
${servivi}.publicKey = "servivi ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkNW0H4Fl6NFgahlgGbSvglg1DrX4yl1ht9Lp+vHE2A";
};
nix.buildMachines = [
nix = {
buildMachines = [
{
hostName = servivi;
system = "x86_64-linux";
@ -28,9 +30,10 @@ in {
mandatoryFeatures = [];
}
];
nix.distributedBuilds = true;
distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours
nix.extraOptions = ''
extraOptions = ''
builders-use-substitutes = true
'';
};
}

View file

@ -31,6 +31,7 @@
];
};
# https://nixos.wiki/wiki/Distributed_build
nixremote = {
isNormalUser = true;
createHome = true;

View file

@ -15,16 +15,7 @@
acpi_call
];
kernelParams = [
"cryptdevice=UUID=ab82b477-2477-453f-b95f-28e5553ad10d:root"
"root=/dev/mapper/root"
];
consoleLogLevel = 0;
initrd = {
verbose = false;
systemd.enable = true;
availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
luks.devices."root" = {

View file

@ -5,6 +5,8 @@
systemd.enable = true;
};
consoleLogLevel = 0;
kernelParams = [
"quiet"
"splash"