diff --git a/nixos/flake.nix b/nixos/flake.nix index 117cbd64..48978cfc 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -62,6 +62,10 @@ system = "x86_64-linux"; modules = [ forAll ./machines/ryzen-shine.nix ]; }; + adele = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ forAll ./machines/adele.nix ]; + }; biskcomp = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; modules = [ forAll piHardware ./machines/biskcomp.nix ]; diff --git a/nixos/machines/adele.nix b/nixos/machines/adele.nix index a0ebb77b..cbb75932 100644 --- a/nixos/machines/adele.nix +++ b/nixos/machines/adele.nix @@ -4,15 +4,26 @@ { config, lib, pkgs, ... }: { - imports = - [ - ../base.nix - ]; + imports = [ + ../full.nix + ../base.nix + ]; - system.stateVersion = "20.03"; + nix = { + package = pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes ca-references + ''; + }; + + hardware.enableRedistributableFirmware = true; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.kernelPackages = pkgs.linuxPackages_latest; + + + hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; + hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -45,4 +56,6 @@ latitude = 37.8104601; longitude = -122.2572529; }; + + system.stateVersion = "20.03"; }