extract i32 emulation

This commit is contained in:
Cyryl Płotnicki 2020-02-02 10:03:09 +00:00
parent 3e7fa4b65e
commit 1d7440d260
3 changed files with 24 additions and 15 deletions

View file

@ -1,17 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
networking.hostName = "foureighty"; networking.hostName = "foureighty";
nixpkgs.config.packageOverrides = pkgs: {
linux_latest_hardened = pkgs.linux_latest_hardened.override {
extraConfig = ''
IA32_EMULATION y
KVM m
KVM_INTEL m
'';
features.ia32Emulation = true;
enableParallelBuilding = true;
};
};
boot = { boot = {
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest_hardened; kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest_hardened;
@ -40,7 +29,6 @@
efiSupport = true; efiSupport = true;
}; };
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
}; };
time.hardwareClockInLocalTime = true; time.hardwareClockInLocalTime = true;
@ -55,12 +43,10 @@
hardware.nvidiaOptimus.disable = true; hardware.nvidiaOptimus.disable = true;
hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 pkgs.pkgsi686Linux.libva ];
hardware.opengl.driSupport32Bit = true;
hardware.pulseaudio.support32Bit = true;
imports = [ imports = [
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
./i32emulation.nix
../boot.nix ../boot.nix
../common.nix ../common.nix
../gfx-intel.nix ../gfx-intel.nix

View file

@ -0,0 +1,18 @@
{ config, pkgs, ... }:
{
nixpkgs.config.packageOverrides = pkgs: {
linux_latest_hardened = pkgs.linux_latest_hardened.override {
extraConfig = ''
IA32_EMULATION y
KVM m
KVM_INTEL m
'';
features.ia32Emulation = true;
enableParallelBuilding = true;
};
};
hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 pkgs.pkgsi686Linux.libva ];
hardware.opengl.driSupport32Bit = true;
hardware.pulseaudio.support32Bit = true;
}

View file

@ -1,5 +1,10 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
docker-containers.meditate = {
image = "meditate";
ports = [ "80:80" ];
};
services = { services = {
fwupd = { fwupd = {
enable = true; enable = true;