From 62ab685cd4349c4b017c3607ab38925e8c817198 Mon Sep 17 00:00:00 2001 From: Dashie Date: Fri, 2 May 2025 12:28:22 +0200 Subject: [PATCH 1/2] Remove vesktop electron override (#12) --- modules/programs/homePackages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/programs/homePackages.nix b/modules/programs/homePackages.nix index 4714f91..b1303b2 100644 --- a/modules/programs/homePackages.nix +++ b/modules/programs/homePackages.nix @@ -3,12 +3,9 @@ options, config, pkgs, - inputs, ... -}: let - # TODO remove when chromium works again - fixedVesktop = pkgs.vesktop.override {electron = pkgs.electron_33;}; -in { +} +: { options.mods.homePackages = { useDefaultPackages = lib.mkOption { default = true; @@ -103,7 +100,7 @@ in { [ (lib.mkIf config.mods.homePackages.ncspot ncspot) (lib.mkIf config.mods.homePackages.orcaSlicer orca-slicer) - (lib.mkIf config.mods.homePackages.vesktop fixedVesktop) + (lib.mkIf config.mods.homePackages.vesktop vesktop) (lib.mkIf config.mods.homePackages.nextcloudClient nextcloud-client) (lib.mkIf (!isNull config.mods.homePackages.matrixClient) config.mods.homePackages.matrixClient) (lib.mkIf (!isNull config.mods.homePackages.mailClient) config.mods.homePackages.mailClient) From e4d521e10f5ba83000ce2b3e5ae5793d8f632e5d Mon Sep 17 00:00:00 2001 From: DashieTM Date: Mon, 5 May 2025 17:25:26 +0200 Subject: [PATCH 2/2] Add bitlocker fix to lanzaboote --- base/common_hardware.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/base/common_hardware.nix b/base/common_hardware.nix index 87d6279..6f3c94d 100644 --- a/base/common_hardware.nix +++ b/base/common_hardware.nix @@ -22,6 +22,7 @@ in { lanzaboote = lib.mkIf config.conf.secureBoot { enable = true; pkiBundle = "/var/lib/sbctl"; + settings.reboot-for-bitlocker = true; }; loader = {