From 74e7ee8364ed6074ea9d79c54e80b9e70689b0e9 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Fri, 28 Mar 2025 10:00:43 +0100 Subject: [PATCH] lock OVMF --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + home/common/default.nix | 1 + hosts/common/default.nix | 1 + hosts/common/extraServices/virtualisation.nix | 3 --- overlays/default.nix | 13 ++++++++++++- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 37dd94c..c4045d1 100644 --- a/flake.lock +++ b/flake.lock @@ -237,6 +237,22 @@ "type": "github" } }, + "nixpkgs-locked": { + "locked": { + "lastModified": 1739661218, + "narHash": "sha256-hEGW0SKD0ORTEmoTuEEONxgENP5kMqe+NCtJug0U6R0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121", + "type": "github" + } + }, "nixpkgs-master": { "locked": { "lastModified": 1742985284, @@ -326,6 +342,7 @@ "hyprpanel": "hyprpanel", "nixpkgs": "nixpkgs_3", "nixpkgs-2744d98": "nixpkgs-2744d98", + "nixpkgs-locked": "nixpkgs-locked", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "rose-pine-hyprcursor": "rose-pine-hyprcursor" diff --git a/flake.nix b/flake.nix index 9dc0dd1..9a3576e 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-2744d98.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121"; + nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; agenix.url = "github:ryantm/agenix"; diff --git a/home/common/default.nix b/home/common/default.nix index aff627c..6f75fb2 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -15,6 +15,7 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.stable-packages + outputs.overlays.locked-packages outputs.overlays.pinned-packages outputs.overlays.master-packages diff --git a/hosts/common/default.nix b/hosts/common/default.nix index e5327e8..32fd4ea 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -28,6 +28,7 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.stable-packages + outputs.overlays.locked-packages outputs.overlays.pinned-packages outputs.overlays.master-packages diff --git a/hosts/common/extraServices/virtualisation.nix b/hosts/common/extraServices/virtualisation.nix index 15be7e9..79dac7d 100644 --- a/hosts/common/extraServices/virtualisation.nix +++ b/hosts/common/extraServices/virtualisation.nix @@ -31,8 +31,5 @@ in { }; }; programs.virt-manager.enable = true; - environment.systemPackages = with pkgs; [ - OVMFFull - ]; }; } diff --git a/overlays/default.nix b/overlays/default.nix index 63a25fa..0e5f5e4 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -13,6 +13,11 @@ brave = prev.brave.override { commandLineArgs = "--password-store=gnome-libsecret"; }; + + auto-cpufreq = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.auto-cpufreq; + OVMF = inputs.nixpkgs-locked.legacyPackages.${prev.system}.OVMF; + trezord = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.trezord; + # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: { # version = "latest"; # or whatever version you want # src = final.fetchFromGitHub { @@ -22,7 +27,6 @@ # hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU="; # }; # }); - trezord = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.trezord; }; stable-packages = final: _prev: { @@ -39,6 +43,13 @@ }; }; + locked-packages = final: _prev: { + locked = import inputs.nixpkgs-locked { + system = final.system; + config.allowUnfree = true; + }; + }; + master-packages = final: _prev: { master = import inputs.nixpkgs-master { system = final.system;