home/common/default.nix

@@ -16,7 +16,6 @@
       outputs.overlays.modifications
       outputs.overlays.stable-packages
       outputs.overlays.pinned-packages
-      outputs.overlays.locked-packages
       outputs.overlays.master-packages
 
       # You can also add overlays exported from other flakes:

hosts/common/default.nix

@@ -29,7 +29,6 @@
       outputs.overlays.modifications
       outputs.overlays.stable-packages
       outputs.overlays.pinned-packages
-      outputs.overlays.locked-packages
       outputs.overlays.master-packages
 
       # You can also add overlays exported from other flakes:

hosts/common/extraServices/virtualisation.nix

@@ -20,8 +20,7 @@ in {
           ovmf = {
             enable = true;
             packages = [
-              pkgs.locked.OVMFFull.fd
+              (pkgs.OVMF.override {
-              (pkgs.locked.OVMF.override {
                 secureBoot = true;
                 tpmSupport = true;
               })

overlays/default.nix

@@ -13,7 +13,6 @@
     brave = prev.brave.override {
       commandLineArgs = "--password-store=gnome-libsecret";
     };
-<<<<<<< Updated upstream
     OVMF = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.OVMF;
     auto-cpufreq = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.auto-cpufreq;
     # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {
@@ -42,13 +41,6 @@
     };
   };
 
-  locked-packages = final: _prev: {
-    pinned = import inputs.nixpkgs-locked {
-      system = final.system;
-      config.allowUnfree = true;
-    };
-  };
-
   master-packages = final: _prev: {
     master = import inputs.nixpkgs-master {
       system = final.system;