diff --git a/overlays/steam.nix b/overlays/steam.nix deleted file mode 100644 index 121f8e1d1..000000000 --- a/overlays/steam.nix +++ /dev/null @@ -1,17 +0,0 @@ -self: super: -let - baseConfig = { - allowUnfree = true; - }; - nixpkgs-steam-56 = import (super.fetchFromGitHub { - owner = "nyanloutre"; - repo = "nixpkgs"; - rev = "7af3a85d8d1a91b57b6cdee0b2e5d88981f310fa"; - sha256 = "1rcd0nw8k1pcp80zm8kyhk288dj5ifmxhpacm1wi5hfnhw194w1g"; - }) {config = baseConfig;}; -in -{ - steam_primus = nixpkgs-steam-56.steamPackages.steam-chrootenv.override { - withPrimus = true; - }; -} diff --git a/systems/ASUS-G46VW/configuration.nix b/systems/ASUS-G46VW/configuration.nix index 497548dc4..59c49236d 100644 --- a/systems/ASUS-G46VW/configuration.nix +++ b/systems/ASUS-G46VW/configuration.nix @@ -12,7 +12,6 @@ ]; nixpkgs.overlays = [ - (import ../../overlays/steam.nix) (import ../../overlays/ledger-udev-rules.nix) ]; @@ -22,7 +21,13 @@ boot.tmpOnTmpfs = true; boot.plymouth.enable = true; - hardware.bumblebee.enable = true; + # NVIDIA + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia.optimus_prime.enable = true; + hardware.nvidia.modesetting.enable = true; + hardware.nvidia.optimus_prime.nvidiaBusId = "PCI:1:0:0"; + hardware.nvidia.optimus_prime.intelBusId = "PCI:0:2:0"; + # For Steam hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; @@ -98,7 +103,7 @@ vlc kodiPlain - steam_primus + steam sc-controller steam-run minecraft