diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix index 289906c9..3f7262c6 100644 --- a/nixos/boxes/foureighty.nix +++ b/nixos/boxes/foureighty.nix @@ -1,17 +1,6 @@ { config, pkgs, ... }: { 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 = { kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest_hardened; @@ -40,7 +29,6 @@ efiSupport = true; }; loader.efi.canTouchEfiVariables = true; - }; time.hardwareClockInLocalTime = true; @@ -55,12 +43,10 @@ hardware.nvidiaOptimus.disable = true; 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 = [ /etc/nixos/hardware-configuration.nix + ./i32emulation.nix ../boot.nix ../common.nix ../gfx-intel.nix diff --git a/nixos/boxes/i32emulation.nix b/nixos/boxes/i32emulation.nix new file mode 100644 index 00000000..e509ad3b --- /dev/null +++ b/nixos/boxes/i32emulation.nix @@ -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; +} diff --git a/nixos/common-services.nix b/nixos/common-services.nix index 9026f115..25848f1c 100644 --- a/nixos/common-services.nix +++ b/nixos/common-services.nix @@ -1,5 +1,10 @@ { config, pkgs, ... }: { + docker-containers.meditate = { + image = "meditate"; + ports = [ "80:80" ]; + }; + services = { fwupd = { enable = true;