From 4a85e1c4022ffc46c6f300c7f50439ce49011b8f Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sat, 30 Dec 2023 00:06:27 -0500
Subject: [PATCH] refactor: update plymouth, remove some useless code

---
 common/overlays/plymouth/default.nix     | 10 ++++---
 devices/binto/hardware-configuration.nix |  3 +-
 devices/oksys/hardware-configuration.nix |  6 ++--
 devices/oksys/modules/remote-builder.nix | 35 +++++++++++++-----------
 devices/servivi/default.nix              |  1 +
 devices/wim/hardware-configuration.nix   |  9 ------
 modules/plymouth.nix                     |  2 ++
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/common/overlays/plymouth/default.nix b/common/overlays/plymouth/default.nix
index 3a40af97..1c9edcec 100644
--- a/common/overlays/plymouth/default.nix
+++ b/common/overlays/plymouth/default.nix
@@ -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=";
     };
   });
 }
diff --git a/devices/binto/hardware-configuration.nix b/devices/binto/hardware-configuration.nix
index 53ecb5cc..553d5618 100644
--- a/devices/binto/hardware-configuration.nix
+++ b/devices/binto/hardware-configuration.nix
@@ -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";
 }
diff --git a/devices/oksys/hardware-configuration.nix b/devices/oksys/hardware-configuration.nix
index f04a152d..edd4e880 100644
--- a/devices/oksys/hardware-configuration.nix
+++ b/devices/oksys/hardware-configuration.nix
@@ -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 = {
diff --git a/devices/oksys/modules/remote-builder.nix b/devices/oksys/modules/remote-builder.nix
index 5404be84..d43157a7 100644
--- a/devices/oksys/modules/remote-builder.nix
+++ b/devices/oksys/modules/remote-builder.nix
@@ -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,20 +18,22 @@ in {
     ${servivi}.publicKey = "servivi ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkNW0H4Fl6NFgahlgGbSvglg1DrX4yl1ht9Lp+vHE2A";
   };
 
-  nix.buildMachines = [
-    {
-      hostName = servivi;
-      system = "x86_64-linux";
-      protocol = "ssh-ng";
-      maxJobs = 1;
-      speedFactor = 2;
-      supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
-      mandatoryFeatures = [];
-    }
-  ];
-  nix.distributedBuilds = true;
-  # optional, useful when the builder has a faster internet connection than yours
-  nix.extraOptions = ''
-    builders-use-substitutes = true
-  '';
+  nix = {
+    buildMachines = [
+      {
+        hostName = servivi;
+        system = "x86_64-linux";
+        protocol = "ssh-ng";
+        maxJobs = 1;
+        speedFactor = 2;
+        supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
+        mandatoryFeatures = [];
+      }
+    ];
+    distributedBuilds = true;
+    # optional, useful when the builder has a faster internet connection than yours
+    extraOptions = ''
+      builders-use-substitutes = true
+    '';
+  };
 }
diff --git a/devices/servivi/default.nix b/devices/servivi/default.nix
index a89fe5f5..0e698219 100644
--- a/devices/servivi/default.nix
+++ b/devices/servivi/default.nix
@@ -31,6 +31,7 @@
       ];
     };
 
+    # https://nixos.wiki/wiki/Distributed_build
     nixremote = {
       isNormalUser = true;
       createHome = true;
diff --git a/devices/wim/hardware-configuration.nix b/devices/wim/hardware-configuration.nix
index 7c34dc33..de2b601a 100644
--- a/devices/wim/hardware-configuration.nix
+++ b/devices/wim/hardware-configuration.nix
@@ -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" = {
diff --git a/modules/plymouth.nix b/modules/plymouth.nix
index b5e64f88..18571e38 100644
--- a/modules/plymouth.nix
+++ b/modules/plymouth.nix
@@ -5,6 +5,8 @@
       systemd.enable = true;
     };
 
+    consoleLogLevel = 0;
+
     kernelParams = [
       "quiet"
       "splash"