miku: Replace packageOverrides with an overlay

This commit is contained in:
PapaTutuWawa 2021-08-24 11:06:35 +02:00
parent 6cd0324cbf
commit e3c5c694a6

View File

@ -1,7 +1,6 @@
{ config, pkgs, modulesPath, lib, fetchGit, ... }: { config, pkgs, modulesPath, lib, fetchGit, ... }:
let let
unstable = (import ../modules/unstable.nix config);
customPkgs = import ../packages/overlay.nix; customPkgs = import ../packages/overlay.nix;
in { in {
imports = [ imports = [
@ -80,14 +79,15 @@ in {
}); });
}) })
# Unstable, NUR, ...
(final: prev: {
unstable = (import ../modules/unstable.nix config);
nur = (import ../modules/nur.nix pkgs);
})
customPkgs customPkgs
]; ];
nixpkgs.config.packageOverrides = pkgs: {
unstable = unstable;
nur = (import ../modules/nur.nix pkgs);
};
security = { security = {
pam.loginLimits = [ pam.loginLimits = [
{ {
@ -259,7 +259,7 @@ in {
enable = true; enable = true;
qemuOvmf = true; qemuOvmf = true;
#qemuRunAsRoot = false; #qemuRunAsRoot = false;
qemuPackage = unstable.qemu; qemuPackage = pkgs.unstable.qemu;
qemuVerbatimConfig = '' qemuVerbatimConfig = ''
seccomp_sandbox = 0 seccomp_sandbox = 0
cgroup_device_acl = [ cgroup_device_acl = [